diff mbox

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

Message ID 1339481546-24491-1-git-send-email-sachin.kamat@linaro.org
State Accepted
Headers show

Commit Message

Sachin Kamat June 12, 2012, 6:12 a.m. UTC 
Replace custom err() macro with v4l2_err() macro.

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

Patch

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..3a82eac 100644
--- a/drivers/media/video/s5p-fimc/fimc-reg.c
+++ b/drivers/media/video/s5p-fimc/fimc-reg.c
@@ -683,7 +683,7 @@  int fimc_hw_set_camera_type(struct fimc_dev *fimc,
 			cfg |= FIMC_REG_CIGCTRL_CAM_JPEG;
 			break;
 		default:
-			v4l2_err(fimc->vid_cap.vfd,
+			v4l2_err(vid_cap->vfd,
 				 "Not supported camera pixel format: %d",
 				 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);