[3/3,media] s5p-fimc: Replace printk with pr_* functions
Commit Message
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<----------------------------------------------------------------
8>----------------------------------------------------------------
Thanks!
Sylwester
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Comments
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
>
@@ -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)
@@ -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);