diff options
author | Joe Perches <joe@perches.com> | 2017-03-21 11:13:10 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2017-03-21 11:13:10 -0400 |
commit | 6f9655b1b81f2aa9207ec3837641299406a26b69 (patch) | |
tree | 934ddb25b6a6fce7e75d973c52ae96f2b79fca06 | |
parent | 3fc4f2f94c9a7c5689d6c70774bab1bb4ff8f297 (diff) |
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: Joe Perches <joe@perches.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
-rw-r--r-- | drivers/video/fbdev/aty/radeon_base.c | 4 | ||||
-rw-r--r-- | drivers/video/fbdev/core/fbmon.c | 4 | ||||
-rw-r--r-- | drivers/video/fbdev/pxafb.c | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c index 218339a4edaa..6b4c7872b375 100644 --- a/drivers/video/fbdev/aty/radeon_base.c +++ b/drivers/video/fbdev/aty/radeon_base.c | |||
@@ -2453,8 +2453,8 @@ static int radeonfb_pci_register(struct pci_dev *pdev, | |||
2453 | err |= sysfs_create_bin_file(&rinfo->pdev->dev.kobj, | 2453 | err |= sysfs_create_bin_file(&rinfo->pdev->dev.kobj, |
2454 | &edid2_attr); | 2454 | &edid2_attr); |
2455 | if (err) | 2455 | if (err) |
2456 | pr_warning("%s() Creating sysfs files failed, continuing\n", | 2456 | pr_warn("%s() Creating sysfs files failed, continuing\n", |
2457 | __func__); | 2457 | __func__); |
2458 | 2458 | ||
2459 | /* save current mode regs before we switch into the new one | 2459 | /* save current mode regs before we switch into the new one |
2460 | * so we can restore this upon __exit | 2460 | * so we can restore this upon __exit |
diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c index 62c0cf79674f..687ebb053438 100644 --- a/drivers/video/fbdev/core/fbmon.c +++ b/drivers/video/fbdev/core/fbmon.c | |||
@@ -1073,9 +1073,9 @@ void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs) | |||
1073 | for (i = specs->modedb_len + num; i < specs->modedb_len + num + svd_n; i++) { | 1073 | for (i = specs->modedb_len + num; i < specs->modedb_len + num + svd_n; i++) { |
1074 | int idx = svd[i - specs->modedb_len - num]; | 1074 | int idx = svd[i - specs->modedb_len - num]; |
1075 | if (!idx || idx >= ARRAY_SIZE(cea_modes)) { | 1075 | if (!idx || idx >= ARRAY_SIZE(cea_modes)) { |
1076 | pr_warning("Reserved SVD code %d\n", idx); | 1076 | pr_warn("Reserved SVD code %d\n", idx); |
1077 | } else if (!cea_modes[idx].xres) { | 1077 | } else if (!cea_modes[idx].xres) { |
1078 | pr_warning("Unimplemented SVD code %d\n", idx); | 1078 | pr_warn("Unimplemented SVD code %d\n", idx); |
1079 | } else { | 1079 | } else { |
1080 | memcpy(&m[i], cea_modes + idx, sizeof(m[i])); | 1080 | memcpy(&m[i], cea_modes + idx, sizeof(m[i])); |
1081 | pr_debug("Adding SVD #%d: %ux%u@%u\n", idx, | 1081 | pr_debug("Adding SVD #%d: %ux%u@%u\n", idx, |
diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c index ef73f14d7ba0..b21a89b03fb4 100644 --- a/drivers/video/fbdev/pxafb.c +++ b/drivers/video/fbdev/pxafb.c | |||
@@ -645,7 +645,7 @@ static void overlay1fb_disable(struct pxafb_layer *ofb) | |||
645 | lcd_writel(ofb->fbi, FBR1, ofb->fbi->fdadr[DMA_OV1] | 0x3); | 645 | lcd_writel(ofb->fbi, FBR1, ofb->fbi->fdadr[DMA_OV1] | 0x3); |
646 | 646 | ||
647 | if (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) == 0) | 647 | if (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) == 0) |
648 | pr_warning("%s: timeout disabling overlay1\n", __func__); | 648 | pr_warn("%s: timeout disabling overlay1\n", __func__); |
649 | 649 | ||
650 | lcd_writel(ofb->fbi, LCCR5, lccr5); | 650 | lcd_writel(ofb->fbi, LCCR5, lccr5); |
651 | } | 651 | } |
@@ -710,7 +710,7 @@ static void overlay2fb_disable(struct pxafb_layer *ofb) | |||
710 | lcd_writel(ofb->fbi, FBR4, ofb->fbi->fdadr[DMA_OV2_Cr] | 0x3); | 710 | lcd_writel(ofb->fbi, FBR4, ofb->fbi->fdadr[DMA_OV2_Cr] | 0x3); |
711 | 711 | ||
712 | if (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) == 0) | 712 | if (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) == 0) |
713 | pr_warning("%s: timeout disabling overlay2\n", __func__); | 713 | pr_warn("%s: timeout disabling overlay2\n", __func__); |
714 | } | 714 | } |
715 | 715 | ||
716 | static struct pxafb_layer_ops ofb_ops[] = { | 716 | static struct pxafb_layer_ops ofb_ops[] = { |
@@ -1187,8 +1187,7 @@ int pxafb_smart_flush(struct fb_info *info) | |||
1187 | lcd_writel(fbi, LCCR0, fbi->reg_lccr0 | LCCR0_ENB); | 1187 | lcd_writel(fbi, LCCR0, fbi->reg_lccr0 | LCCR0_ENB); |
1188 | 1188 | ||
1189 | if (wait_for_completion_timeout(&fbi->command_done, HZ/2) == 0) { | 1189 | if (wait_for_completion_timeout(&fbi->command_done, HZ/2) == 0) { |
1190 | pr_warning("%s: timeout waiting for command done\n", | 1190 | pr_warn("%s: timeout waiting for command done\n", __func__); |
1191 | __func__); | ||
1192 | ret = -ETIMEDOUT; | 1191 | ret = -ETIMEDOUT; |
1193 | } | 1192 | } |
1194 | 1193 | ||