UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] s5p-fimc: Replace custom err() macro with v4l2_err() macro 

Replace custom err() macro with v4l2_err() macro.

[s.nawrocki: added missing end-of-line at the log print]

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>
This commit is contained in:
Sachin Kamat 2012-06-12 03:12:26 -03:00 committed by Mauro Carvalho Chehab
parent c2d430af08
commit a516d08fa6
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/video/s5p-fimc/fimc-core.h
View File

@ -27,9 +27,6 @@
#include <media/v4l2-mediabus.h> #include <media/v4l2-mediabus.h>
#include <media/s5p_fimc.h> #include <media/s5p_fimc.h>
#define err(fmt, args...) \
printk(KERN_ERR "%s:%d: " fmt "\n", __func__, __LINE__, ##args)
#define dbg(fmt, args...) \ #define dbg(fmt, args...) \
pr_debug("%s:%d: " fmt "\n", __func__, __LINE__, ##args) pr_debug("%s:%d: " fmt "\n", __func__, __LINE__, ##args)

6
drivers/media/video/s5p-fimc/fimc-reg.c
View File

@ -683,8 +683,8 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
cfg |= FIMC_REG_CIGCTRL_CAM_JPEG; cfg |= FIMC_REG_CIGCTRL_CAM_JPEG;
break; break;
default: default:
v4l2_err(fimc->vid_cap.vfd, v4l2_err(vid_cap->vfd,
"Not supported camera pixel format: %d", "Not supported camera pixel format: %#x\n",
vid_cap->mf.code); vid_cap->mf.code);
return -EINVAL; return -EINVAL;
} }
@ -699,7 +699,7 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
} else if (cam->bus_type == FIMC_LCD_WB) { } else if (cam->bus_type == FIMC_LCD_WB) {
cfg |= FIMC_REG_CIGCTRL_CAMIF_SELWB; cfg |= FIMC_REG_CIGCTRL_CAMIF_SELWB;
} else { } else {
err("invalid camera bus type selected\n"); v4l2_err(vid_cap->vfd, "Invalid camera bus type selected\n");
return -EINVAL; return -EINVAL;
} }
writel(cfg, fimc->regs + FIMC_REG_CIGCTRL); writel(cfg, fimc->regs + FIMC_REG_CIGCTRL);