[PATCH 1/3] [media] s5p-tv: Replace printk with pr_* functions

[PATCH 1/3] [media] s5p-tv: Replace printk with pr_* functions

[Sachin Kamat]

Replace printk with pr_* functions to silence checkpatch warnings.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/video/s5p-tv/hdmi_drv.c    |    6 ++++--
 drivers/media/video/s5p-tv/mixer_drv.c   |    6 +++---
 drivers/media/video/s5p-tv/mixer_video.c |    4 +++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/media/video/s5p-tv/hdmi_drv.c b/drivers/media/video/s5p-tv/hdmi_drv.c
index 20cb6ee..8a9cf43 100644
--- a/drivers/media/video/s5p-tv/hdmi_drv.c
+++ b/drivers/media/video/s5p-tv/hdmi_drv.c
@@ -11,6 +11,8 @@
  * or (at your option) any later version
  */
 
+#define pr_fmt(fmt) "s5p-tv (hdmi_drv): " fmt
+
 #ifdef CONFIG_VIDEO_SAMSUNG_S5P_HDMI_DEBUG
 #define DEBUG
 #endif
@@ -161,12 +163,12 @@ static irqreturn_t hdmi_irq_handler(int irq, void *dev_data)
 	intc_flag = hdmi_read(hdev, HDMI_INTC_FLAG);
 	/* clearing flags for HPD plug/unplug */
 	if (intc_flag & HDMI_INTC_FLAG_HPD_UNPLUG) {
-		printk(KERN_INFO "unplugged\n");
+		pr_info("unplugged\n");
 		hdmi_write_mask(hdev, HDMI_INTC_FLAG, ~0,
 			HDMI_INTC_FLAG_HPD_UNPLUG);
 	}
 	if (intc_flag & HDMI_INTC_FLAG_HPD_PLUG) {
-		printk(KERN_INFO "plugged\n");
+		pr_info("plugged\n");
 		hdmi_write_mask(hdev, HDMI_INTC_FLAG, ~0,
 			HDMI_INTC_FLAG_HPD_PLUG);
 	}
diff --git a/drivers/media/video/s5p-tv/mixer_drv.c b/drivers/media/video/s5p-tv/mixer_drv.c
index edca065..a15ca05 100644
--- a/drivers/media/video/s5p-tv/mixer_drv.c
+++ b/drivers/media/video/s5p-tv/mixer_drv.c
@@ -461,10 +461,10 @@ static struct platform_driver mxr_driver __refdata = {
 static int __init mxr_init(void)
 {
 	int i, ret;
-	static const char banner[] __initconst = KERN_INFO
+	static const char banner[] __initconst =
 		"Samsung TV Mixer driver, "
 		"(c) 2010-2011 Samsung Electronics Co., Ltd.\n";
-	printk(banner);
+	pr_info("%s\n", banner);
 
 	/* Loading auxiliary modules */
 	for (i = 0; i < ARRAY_SIZE(mxr_output_conf); ++i)
@@ -472,7 +472,7 @@ static int __init mxr_init(void)
 
 	ret = platform_driver_register(&mxr_driver);
 	if (ret != 0) {
-		printk(KERN_ERR "registration of MIXER driver failed\n");
+		pr_err("s5p-tv: registration of MIXER driver failed\n");
 		return -ENXIO;
 	}
 
diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c
index 33fde2a..b17409b 100644
--- a/drivers/media/video/s5p-tv/mixer_video.c
+++ b/drivers/media/video/s5p-tv/mixer_video.c
@@ -11,6 +11,8 @@
  * or (at your option) any later version
  */
 
+#define pr_fmt(fmt) "s5p-tv (mixer): " fmt
+
 #include "mixer.h"
 
 #include <media/v4l2-ioctl.h>
@@ -1036,7 +1038,7 @@ void mxr_base_layer_release(struct mxr_layer *layer)
 
 static void mxr_vfd_release(struct video_device *vdev)
 {
-	printk(KERN_INFO "video device release\n");
+	pr_info("video device release\n");
 }
 
 struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
-- 
1.7.4.1

[PATCH 2/3] [media] s5p-mfc: Replace printk with pr_* functions

[Sachin Kamat]

Replace printk with pr_* functions to silence checkpatch warnings.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/video/s5p-mfc/s5p_mfc_debug.h |    6 +++---
 drivers/media/video/s5p-mfc/s5p_mfc_opr.c   |    5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_debug.h b/drivers/media/video/s5p-mfc/s5p_mfc_debug.h
index ecb8616..fea2c6e 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_debug.h
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_debug.h
@@ -23,7 +23,7 @@ extern int debug;
 #define mfc_debug(level, fmt, args...)				\
 	do {							\
 		if (debug >= level)				\
-			printk(KERN_DEBUG "%s:%d: " fmt,	\
+			pr_debug("%s:%d: " fmt,	\
 				__func__, __LINE__, ##args);	\
 	} while (0)
 #else
@@ -35,13 +35,13 @@ extern int debug;
 
 #define mfc_err(fmt, args...)				\
 	do {						\
-		printk(KERN_ERR "%s:%d: " fmt,		\
+		pr_err("%s:%d: " fmt,		\
 		       __func__, __LINE__, ##args);	\
 	} while (0)
 
 #define mfc_info(fmt, args...)				\
 	do {						\
-		printk(KERN_INFO "%s:%d: " fmt,		\
+		pr_info("%s:%d: " fmt,		\
 		       __func__, __LINE__, ##args);	\
 	} while (0)
 
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_opr.c b/drivers/media/video/s5p-mfc/s5p_mfc_opr.c
index e6217cb..6d3f398 100644
--- a/drivers/media/video/s5p-mfc/s5p_mfc_opr.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_opr.c
@@ -12,6 +12,8 @@
  * published by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) "s5p-mfc: " fmt
+
 #include "regs-mfc.h"
 #include "s5p_mfc_cmd.h"
 #include "s5p_mfc_common.h"
@@ -187,8 +189,7 @@ int s5p_mfc_alloc_codec_buffers(struct s5p_mfc_ctx *ctx)
 		dev->alloc_ctx[MFC_BANK1_ALLOC_CTX], ctx->bank1_size);
 		if (IS_ERR(ctx->bank1_buf)) {
 			ctx->bank1_buf = NULL;
-			printk(KERN_ERR
-			       "Buf alloc for decoding failed (port A)\n");
+			pr_err("Buf alloc for decoding failed (port A)\n");
 			return -ENOMEM;
 		}
 		ctx->bank1_phys = s5p_mfc_mem_cookie(
-- 
1.7.4.1

[PATCH 3/3] [media] s5p-fimc: Replace printk with pr_* functions

[Sachin Kamat]

Replace printk with pr_* functions to silence checkpatch warnings.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/video/s5p-fimc/fimc-core.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/s5p-fimc/fimc-core.h b/drivers/media/video/s5p-fimc/fimc-core.h
index 95b27ae..c22fb0a 100644
--- a/drivers/media/video/s5p-fimc/fimc-core.h
+++ b/drivers/media/video/s5p-fimc/fimc-core.h
@@ -28,7 +28,7 @@
 #include <media/s5p_fimc.h>
 
 #define err(fmt, args...) \
-	printk(KERN_ERR "%s:%d: " fmt "\n", __func__, __LINE__, ##args)
+	pr_err("%s:%d: " fmt "\n", __func__, __LINE__, ##args)
 
 #define dbg(fmt, args...) \
 	pr_debug("%s:%d: " fmt "\n", __func__, __LINE__, ##args)
-- 
1.7.4.1

Re: [PATCH 3/3] [media] s5p-fimc: Replace printk with pr_* functions

[Sylwester Nawrocki]

Hi Sachin,

On 06/11/2012 12:13 PM, Sachin Kamat wrote:
> Replace printk with pr_* functions to silence checkpatch warnings.
> 
> Signed-off-by: Sachin Kamat<sachin.kamat@linaro.org>
> ---
>   drivers/media/video/s5p-fimc/fimc-core.h |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/media/video/s5p-fimc/fimc-core.h b/drivers/media/video/s5p-fimc/fimc-core.h
> index 95b27ae..c22fb0a 100644
> --- a/drivers/media/video/s5p-fimc/fimc-core.h
> +++ b/drivers/media/video/s5p-fimc/fimc-core.h
> @@ -28,7 +28,7 @@
>   #include<media/s5p_fimc.h>
> 
>   #define err(fmt, args...) \
> -	printk(KERN_ERR "%s:%d: " fmt "\n", __func__, __LINE__, ##args)
> +	pr_err("%s:%d: " fmt "\n", __func__, __LINE__, ##args)

I don't think it's worth the effort. If you really want to get rid
of that warnings, please remove the err() macro altogether and
do something like this instead:

8<----------------------------------------------------------------

diff --git a/drivers/media/video/s5p-fimc/fimc-core.h b/drivers/media/video/s5p-fimc/fimc-core.h
index 95b27ae..808ccc6 100644
--- a/drivers/media/video/s5p-fimc/fimc-core.h
+++ b/drivers/media/video/s5p-fimc/fimc-core.h
@@ -27,9 +27,6 @@
 #include <media/v4l2-mediabus.h>
 #include <media/s5p_fimc.h>
 
-#define err(fmt, args...) \
-       printk(KERN_ERR "%s:%d: " fmt "\n", __func__, __LINE__, ##args)
-
 #define dbg(fmt, args...) \
        pr_debug("%s:%d: " fmt "\n", __func__, __LINE__, ##args)
 
diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c b/drivers/media/video/s5p-fimc/fimc-reg.c
index 1fc4ce8..74a2fba 100644
--- a/drivers/media/video/s5p-fimc/fimc-reg.c
+++ b/drivers/media/video/s5p-fimc/fimc-reg.c
@@ -683,8 +683,8 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
                        cfg |= FIMC_REG_CIGCTRL_CAM_JPEG;
                        break;
                default:
-                       v4l2_err(fimc->vid_cap.vfd,
-                                "Not supported camera pixel format: %d",
+                       v4l2_err(vid_cap->vfd,
+                                "Not supported camera pixel format: %#x\n",
                                 vid_cap->mf.code);
                        return -EINVAL;
                }
@@ -699,7 +699,7 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
        } else if (cam->bus_type == FIMC_LCD_WB) {
                cfg |= FIMC_REG_CIGCTRL_CAMIF_SELWB;
        } else {
-               err("invalid camera bus type selected\n");
+               v4l2_err(vid_cap->vfd, "Invalid camera bus type selected\n");
                return -EINVAL;
        }
        writel(cfg, fimc->regs + FIMC_REG_CIGCTRL);

8>----------------------------------------------------------------


Thanks!

Sylwester

Re: [PATCH 3/3] [media] s5p-fimc: Replace printk with pr_* functions

[Sachin Kamat]

Hi Sylwester,

On 11/06/2012, Sylwester Nawrocki <snjw23@gmail.com> wrote:
> Hi Sachin,
>
> On 06/11/2012 12:13 PM, Sachin Kamat wrote:
>> Replace printk with pr_* functions to silence checkpatch warnings.
>>
>> Signed-off-by: Sachin Kamat<sachin.kamat@linaro.org>
>> ---
>>   drivers/media/video/s5p-fimc/fimc-core.h |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/media/video/s5p-fimc/fimc-core.h
>> b/drivers/media/video/s5p-fimc/fimc-core.h
>> index 95b27ae..c22fb0a 100644
>> --- a/drivers/media/video/s5p-fimc/fimc-core.h
>> +++ b/drivers/media/video/s5p-fimc/fimc-core.h
>> @@ -28,7 +28,7 @@
>>   #include<media/s5p_fimc.h>
>>
>>   #define err(fmt, args...) \
>> -	printk(KERN_ERR "%s:%d: " fmt "\n", __func__, __LINE__, ##args)
>> +	pr_err("%s:%d: " fmt "\n", __func__, __LINE__, ##args)
>
> I don't think it's worth the effort. If you really want to get rid
> of that warnings, please remove the err() macro altogether and
> do something like this instead:

Sounds reasonable. Will do that.

>
> 8<----------------------------------------------------------------
>
> diff --git a/drivers/media/video/s5p-fimc/fimc-core.h
> b/drivers/media/video/s5p-fimc/fimc-core.h
> index 95b27ae..808ccc6 100644
> --- a/drivers/media/video/s5p-fimc/fimc-core.h
> +++ b/drivers/media/video/s5p-fimc/fimc-core.h
> @@ -27,9 +27,6 @@
>  #include <media/v4l2-mediabus.h>
>  #include <media/s5p_fimc.h>
>
> -#define err(fmt, args...) \
> -       printk(KERN_ERR "%s:%d: " fmt "\n", __func__, __LINE__, ##args)
> -
>  #define dbg(fmt, args...) \
>         pr_debug("%s:%d: " fmt "\n", __func__, __LINE__, ##args)
>
> diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c
> b/drivers/media/video/s5p-fimc/fimc-reg.c
> index 1fc4ce8..74a2fba 100644
> --- a/drivers/media/video/s5p-fimc/fimc-reg.c
> +++ b/drivers/media/video/s5p-fimc/fimc-reg.c
> @@ -683,8 +683,8 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
>                         cfg |= FIMC_REG_CIGCTRL_CAM_JPEG;
>                         break;
>                 default:
> -                       v4l2_err(fimc->vid_cap.vfd,
> -                                "Not supported camera pixel format: %d",
> +                       v4l2_err(vid_cap->vfd,
> +                                "Not supported camera pixel format:
> %#x\n",
>                                  vid_cap->mf.code);
>                         return -EINVAL;
>                 }
> @@ -699,7 +699,7 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
>         } else if (cam->bus_type == FIMC_LCD_WB) {
>                 cfg |= FIMC_REG_CIGCTRL_CAMIF_SELWB;
>         } else {
> -               err("invalid camera bus type selected\n");
> +               v4l2_err(vid_cap->vfd, "Invalid camera bus type
> selected\n");
>                 return -EINVAL;
>         }
>         writel(cfg, fimc->regs + FIMC_REG_CIGCTRL);
>
> 8>----------------------------------------------------------------
>
>
> Thanks!
>
> Sylwester
>


-- 
With warm regards,
Sachin

RE: [PATCH 2/3] [media] s5p-mfc: Replace printk with pr_* functions

[Kamil Debski]

Hi Sachin,

I am afraid that I have to NACK this patch.

pr_debug/pr_err/etc. is useful when you want to add some data in front of the
debug message.

So if you really insist then you could try to add something like this

+#define pr_fmt(fmt) ":%s:%d: " fmt, __func__, __LINE__

+#define mfc_err pr_err

I share the opinion on these patch with Sylwester's opinion on the similar
patch
for FIMC - I don't think it's worth the effort. 

Best wishes,
--
Kamil Debski
Linux Platform Group
Samsung Poland R&D Center


> -----Original Message-----
> From: Sachin Kamat [mailto:sachin.kamat@linaro.org]
> Sent: 11 June 2012 12:14
> To: linux-media@vger.kernel.org
> Cc: t.stanislaws@samsung.com; k.debski@samsung.com;
> s.nawrocki@samsung.com; snjw23@gmail.com; kyungmin.park@samsung.com;
> mchehab@infradead.org; sachin.kamat@linaro.org; patches@linaro.org
> Subject: [PATCH 2/3] [media] s5p-mfc: Replace printk with pr_* functions
> 
> Replace printk with pr_* functions to silence checkpatch warnings.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  drivers/media/video/s5p-mfc/s5p_mfc_debug.h |    6 +++---
>  drivers/media/video/s5p-mfc/s5p_mfc_opr.c   |    5 +++--
>  2 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_debug.h
> b/drivers/media/video/s5p-mfc/s5p_mfc_debug.h
> index ecb8616..fea2c6e 100644
> --- a/drivers/media/video/s5p-mfc/s5p_mfc_debug.h
> +++ b/drivers/media/video/s5p-mfc/s5p_mfc_debug.h
> @@ -23,7 +23,7 @@ extern int debug;
>  #define mfc_debug(level, fmt, args...)				\
>  	do {							\
>  		if (debug >= level)				\
> -			printk(KERN_DEBUG "%s:%d: " fmt,	\
> +			pr_debug("%s:%d: " fmt,	\
>  				__func__, __LINE__, ##args);	\
>  	} while (0)
>  #else
> @@ -35,13 +35,13 @@ extern int debug;
> 
>  #define mfc_err(fmt, args...)				\
>  	do {						\
> -		printk(KERN_ERR "%s:%d: " fmt,		\
> +		pr_err("%s:%d: " fmt,		\
>  		       __func__, __LINE__, ##args);	\
>  	} while (0)
> 
>  #define mfc_info(fmt, args...)				\
>  	do {						\
> -		printk(KERN_INFO "%s:%d: " fmt,		\
> +		pr_info("%s:%d: " fmt,		\
>  		       __func__, __LINE__, ##args);	\
>  	} while (0)
> 
> diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_opr.c
> b/drivers/media/video/s5p-mfc/s5p_mfc_opr.c
> index e6217cb..6d3f398 100644
> --- a/drivers/media/video/s5p-mfc/s5p_mfc_opr.c
> +++ b/drivers/media/video/s5p-mfc/s5p_mfc_opr.c
> @@ -12,6 +12,8 @@
>   * published by the Free Software Foundation.
>   */
> 
> +#define pr_fmt(fmt) "s5p-mfc: " fmt
> +
>  #include "regs-mfc.h"
>  #include "s5p_mfc_cmd.h"
>  #include "s5p_mfc_common.h"
> @@ -187,8 +189,7 @@ int s5p_mfc_alloc_codec_buffers(struct s5p_mfc_ctx
> *ctx)
>  		dev->alloc_ctx[MFC_BANK1_ALLOC_CTX], ctx->bank1_size);
>  		if (IS_ERR(ctx->bank1_buf)) {
>  			ctx->bank1_buf = NULL;
> -			printk(KERN_ERR
> -			       "Buf alloc for decoding failed (port A)\n");
> +			pr_err("Buf alloc for decoding failed (port A)\n");
>  			return -ENOMEM;

This can be replaced with mfc_err to make it consistent with other error
messages in this file.
It's my mistake that I have use printk(KERN_ERR ...

I think it is beneficial to read the neighboring lines of the line which
checkpatch
returns a warning in.

>  		}
>  		ctx->bank1_phys = s5p_mfc_mem_cookie(
> --
> 1.7.4.1

Re: [PATCH 1/3] [media] s5p-tv: Replace printk with pr_* functions

[Sylwester Nawrocki]

On 06/11/2012 12:13 PM, Sachin Kamat wrote:
> Replace printk with pr_* functions to silence checkpatch warnings.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>

Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>