1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/media/platform/s5p-fimc/fimc-lite-reg.c b/drivers/media/platform/s5p-fimc/fimc-lite-reg.c
index a22d7eb05c82..f0af0754a7b4 100644
--- a/drivers/media/platform/s5p-fimc/fimc-lite-reg.c
+++ b/drivers/media/platform/s5p-fimc/fimc-lite-reg.c
@@ -65,7 +65,7 @@ void flite_hw_set_interrupt_mask(struct fimc_lite *dev)
         u32 cfg, intsrc;
 
         /* Select interrupts to be enabled for each output mode */
-        if (dev->out_path == FIMC_IO_DMA) {
+        if (atomic_read(&dev->out_path) == FIMC_IO_DMA) {
                 intsrc = FLITE_REG_CIGCTRL_IRQ_OVFEN |
                          FLITE_REG_CIGCTRL_IRQ_LASTEN |
                          FLITE_REG_CIGCTRL_IRQ_STARTEN;
@@ -187,12 +187,12 @@ static void flite_hw_set_camera_port(struct fimc_lite *dev, int id)
 
 /* Select serial or parallel bus, camera port (A,B) and set signals polarity */
 void flite_hw_set_camera_bus(struct fimc_lite *dev,
-                             struct s5p_fimc_isp_info *s_info)
+                             struct fimc_source_info *si)
 {
         u32 cfg = readl(dev->regs + FLITE_REG_CIGCTRL);
-        unsigned int flags = s_info->flags;
+        unsigned int flags = si->flags;
 
-        if (s_info->bus_type != FIMC_MIPI_CSI2) {
+        if (si->sensor_bus_type != FIMC_BUS_TYPE_MIPI_CSI2) {
                 cfg &= ~(FLITE_REG_CIGCTRL_SELCAM_MIPI |
                          FLITE_REG_CIGCTRL_INVPOLPCLK |
                          FLITE_REG_CIGCTRL_INVPOLVSYNC |
@@ -212,7 +212,7 @@ void flite_hw_set_camera_bus(struct fimc_lite *dev,
 
         writel(cfg, dev->regs + FLITE_REG_CIGCTRL);
 
-        flite_hw_set_camera_port(dev, s_info->mux_id);
+        flite_hw_set_camera_port(dev, si->mux_id);
 }
 
 static void flite_hw_set_out_order(struct fimc_lite *dev, struct flite_frame *f)
@@ -292,9 +292,11 @@ void flite_hw_dump_regs(struct fimc_lite *dev, const char *label)
         };
         u32 i;
 
-        pr_info("--- %s ---\n", label);
+        v4l2_info(&dev->subdev, "--- %s ---\n", label);
+
         for (i = 0; i < ARRAY_SIZE(registers); i++) {
                 u32 cfg = readl(dev->regs + registers[i].offset);
-                pr_info("%s: %s:\t0x%08x\n", __func__, registers[i].name, cfg);
+                v4l2_info(&dev->subdev, "%9s: 0x%08x\n",
+                          registers[i].name, cfg);
         }
 }