Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a516d08f authored by Sachin Kamat's avatar Sachin Kamat Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent c2d430af

drivers/media/video/s5p-fimc/fimc-core.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -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)

drivers/media/video/s5p-fimc/fimc-reg.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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);