Commit 6f9655b1 authored by Joe Perches's avatar Joe Perches Committed by Bartlomiej Zolnierkiewicz
Browse files

drivers/video: Convert remaining uses of pr_warning to pr_warn 



To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/video

Prior to this patch, there were 6 uses of pr_warning and
25 uses of pr_warn in drivers/video

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 3fc4f2f9

drivers/video/fbdev/aty/radeon_base.c

+2 −2
Original line number Diff line number Diff line
@@ -2453,7 +2453,7 @@ static int radeonfb_pci_register(struct pci_dev *pdev, 
		err |= sysfs_create_bin_file(&rinfo->pdev->dev.kobj,

						&edid2_attr);

	if (err)

		pr_warning("%s() Creating sysfs files failed, continuing\n",

		pr_warn("%s() Creating sysfs files failed, continuing\n",

			__func__);



	/* save current mode regs before we switch into the new one

drivers/video/fbdev/core/fbmon.c

+2 −2
Original line number Diff line number Diff line
@@ -1073,9 +1073,9 @@ void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs) 
	for (i = specs->modedb_len + num; i < specs->modedb_len + num + svd_n; i++) {

		int idx = svd[i - specs->modedb_len - num];

		if (!idx || idx >= ARRAY_SIZE(cea_modes)) {

			pr_warning("Reserved SVD code %d\n", idx);

			pr_warn("Reserved SVD code %d\n", idx);

		} else if (!cea_modes[idx].xres) {

			pr_warning("Unimplemented SVD code %d\n", idx);

			pr_warn("Unimplemented SVD code %d\n", idx);

		} else {

			memcpy(&m[i], cea_modes + idx, sizeof(m[i]));

			pr_debug("Adding SVD #%d: %ux%u@%u\n", idx,

drivers/video/fbdev/pxafb.c

+3 −4
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static void overlay1fb_disable(struct pxafb_layer *ofb) 
	lcd_writel(ofb->fbi, FBR1, ofb->fbi->fdadr[DMA_OV1] | 0x3);



	if (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) == 0)

		pr_warning("%s: timeout disabling overlay1\n", __func__);

		pr_warn("%s: timeout disabling overlay1\n", __func__);



	lcd_writel(ofb->fbi, LCCR5, lccr5);

}
@@ -710,7 +710,7 @@ static void overlay2fb_disable(struct pxafb_layer *ofb) 
	lcd_writel(ofb->fbi, FBR4, ofb->fbi->fdadr[DMA_OV2_Cr] | 0x3);



	if (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) == 0)

		pr_warning("%s: timeout disabling overlay2\n", __func__);

		pr_warn("%s: timeout disabling overlay2\n", __func__);

}



static struct pxafb_layer_ops ofb_ops[] = {
@@ -1187,8 +1187,7 @@ int pxafb_smart_flush(struct fb_info *info) 
	lcd_writel(fbi, LCCR0, fbi->reg_lccr0 | LCCR0_ENB);



	if (wait_for_completion_timeout(&fbi->command_done, HZ/2) == 0) {

		pr_warning("%s: timeout waiting for command done\n",

				__func__);

		pr_warn("%s: timeout waiting for command done\n", __func__);

		ret = -ETIMEDOUT;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE