aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-06-11 05:13:52 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-15 18:00:19 -0400
commitf5c99037428b95da2ccc16daae6764b519ae0a90 (patch)
tree550be27437086abdbb11b7725631be01891179ba
parent00d98c1bd6fe93de6db6a99ed25b4b7d96a402ec (diff)
[media] s5p-tv: Replace printk with pr_* functions
Replace printk with pr_* functions to silence checkpatch warnings. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/platform/s5p-tv/hdmi_drv.c6
-rw-r--r--drivers/media/platform/s5p-tv/mixer_drv.c6
-rw-r--r--drivers/media/platform/s5p-tv/mixer_video.c4
3 files changed, 10 insertions, 6 deletions
diff --git a/drivers/media/platform/s5p-tv/hdmi_drv.c b/drivers/media/platform/s5p-tv/hdmi_drv.c
index 20cb6eef2979..8a9cf43018f6 100644
--- a/drivers/media/platform/s5p-tv/hdmi_drv.c
+++ b/drivers/media/platform/s5p-tv/hdmi_drv.c
@@ -11,6 +11,8 @@
11 * or (at your option) any later version 11 * or (at your option) any later version
12 */ 12 */
13 13
14#define pr_fmt(fmt) "s5p-tv (hdmi_drv): " fmt
15
14#ifdef CONFIG_VIDEO_SAMSUNG_S5P_HDMI_DEBUG 16#ifdef CONFIG_VIDEO_SAMSUNG_S5P_HDMI_DEBUG
15#define DEBUG 17#define DEBUG
16#endif 18#endif
@@ -161,12 +163,12 @@ static irqreturn_t hdmi_irq_handler(int irq, void *dev_data)
161 intc_flag = hdmi_read(hdev, HDMI_INTC_FLAG); 163 intc_flag = hdmi_read(hdev, HDMI_INTC_FLAG);
162 /* clearing flags for HPD plug/unplug */ 164 /* clearing flags for HPD plug/unplug */
163 if (intc_flag & HDMI_INTC_FLAG_HPD_UNPLUG) { 165 if (intc_flag & HDMI_INTC_FLAG_HPD_UNPLUG) {
164 printk(KERN_INFO "unplugged\n"); 166 pr_info("unplugged\n");
165 hdmi_write_mask(hdev, HDMI_INTC_FLAG, ~0, 167 hdmi_write_mask(hdev, HDMI_INTC_FLAG, ~0,
166 HDMI_INTC_FLAG_HPD_UNPLUG); 168 HDMI_INTC_FLAG_HPD_UNPLUG);
167 } 169 }
168 if (intc_flag & HDMI_INTC_FLAG_HPD_PLUG) { 170 if (intc_flag & HDMI_INTC_FLAG_HPD_PLUG) {
169 printk(KERN_INFO "plugged\n"); 171 pr_info("plugged\n");
170 hdmi_write_mask(hdev, HDMI_INTC_FLAG, ~0, 172 hdmi_write_mask(hdev, HDMI_INTC_FLAG, ~0,
171 HDMI_INTC_FLAG_HPD_PLUG); 173 HDMI_INTC_FLAG_HPD_PLUG);
172 } 174 }
diff --git a/drivers/media/platform/s5p-tv/mixer_drv.c b/drivers/media/platform/s5p-tv/mixer_drv.c
index edca06592883..a15ca0595b87 100644
--- a/drivers/media/platform/s5p-tv/mixer_drv.c
+++ b/drivers/media/platform/s5p-tv/mixer_drv.c
@@ -461,10 +461,10 @@ static struct platform_driver mxr_driver __refdata = {
461static int __init mxr_init(void) 461static int __init mxr_init(void)
462{ 462{
463 int i, ret; 463 int i, ret;
464 static const char banner[] __initconst = KERN_INFO 464 static const char banner[] __initconst =
465 "Samsung TV Mixer driver, " 465 "Samsung TV Mixer driver, "
466 "(c) 2010-2011 Samsung Electronics Co., Ltd.\n"; 466 "(c) 2010-2011 Samsung Electronics Co., Ltd.\n";
467 printk(banner); 467 pr_info("%s\n", banner);
468 468
469 /* Loading auxiliary modules */ 469 /* Loading auxiliary modules */
470 for (i = 0; i < ARRAY_SIZE(mxr_output_conf); ++i) 470 for (i = 0; i < ARRAY_SIZE(mxr_output_conf); ++i)
@@ -472,7 +472,7 @@ static int __init mxr_init(void)
472 472
473 ret = platform_driver_register(&mxr_driver); 473 ret = platform_driver_register(&mxr_driver);
474 if (ret != 0) { 474 if (ret != 0) {
475 printk(KERN_ERR "registration of MIXER driver failed\n"); 475 pr_err("s5p-tv: registration of MIXER driver failed\n");
476 return -ENXIO; 476 return -ENXIO;
477 } 477 }
478 478
diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
index e0e02cce1bcb..a9c6be39246d 100644
--- a/drivers/media/platform/s5p-tv/mixer_video.c
+++ b/drivers/media/platform/s5p-tv/mixer_video.c
@@ -11,6 +11,8 @@
11 * or (at your option) any later version 11 * or (at your option) any later version
12 */ 12 */
13 13
14#define pr_fmt(fmt) "s5p-tv (mixer): " fmt
15
14#include "mixer.h" 16#include "mixer.h"
15 17
16#include <media/v4l2-ioctl.h> 18#include <media/v4l2-ioctl.h>
@@ -1053,7 +1055,7 @@ void mxr_base_layer_release(struct mxr_layer *layer)
1053 1055
1054static void mxr_vfd_release(struct video_device *vdev) 1056static void mxr_vfd_release(struct video_device *vdev)
1055{ 1057{
1056 printk(KERN_INFO "video device release\n"); 1058 pr_info("video device release\n");
1057} 1059}
1058 1060
1059struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev, 1061struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,