media: camss: vfe: Remove vfe_hw_version_read() argument

The device argument is not needed, since it is accessible through
the vfe_device argument already.

Signed-off-by: Robert Foss <robert.foss@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c
index 1ad502a1c2767422df30a9915a2c2df197d59bf7..8ef4e80a62a2d8746e10b3e89e34f391593092e3 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe-170.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c
@@ -177,7 +177,7 @@
 #define VFE_BUS_WM_FRAME_INC(n)                        (0x2258 + (n) * 0x100)
 #define VFE_BUS_WM_BURST_LIMIT(n)              (0x225c + (n) * 0x100)
 
-static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
+static void vfe_hw_version_read(struct vfe_device *vfe)
 {
        u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
 
@@ -185,7 +185,8 @@ static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
        u32 rev = (hw_version >> 16) & 0xFFF;
        u32 step = hw_version & 0xFFFF;
 
-       dev_dbg(dev, "VFE HW Version = %u.%u.%u\n", gen, rev, step);
+       dev_dbg(vfe->camss->dev, "VFE HW Version = %u.%u.%u\n",
+               gen, rev, step);
 }
 
 static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)

diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
index 53c56a8d45458dedbaef87b6118c48c71f28387f..614c266e8cd1f370357f9ba931a03b276e91c97a 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
@@ -210,11 +210,11 @@
 #define MSM_VFE_VFE0_UB_SIZE 1023
 #define MSM_VFE_VFE0_UB_SIZE_RDI (MSM_VFE_VFE0_UB_SIZE / 3)
 
-static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
+static void vfe_hw_version_read(struct vfe_device *vfe)
 {
        u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION);
 
-       dev_dbg(dev, "VFE HW Version = 0x%08x\n", hw_version);
+       dev_dbg(vfe->camss->dev, "VFE HW Version = 0x%08x\n", hw_version);
 }
 
 static u16 vfe_get_ub_size(u8 vfe_id)

diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
index 13f0fa6a7d60c817244e681fa6c62afbdb3e03e9..aa175e0f6331ce83a58bae68cd7170cd41e3161a 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
@@ -254,11 +254,11 @@
 #define MSM_VFE_VFE1_UB_SIZE 1535
 #define MSM_VFE_VFE1_UB_SIZE_RDI (MSM_VFE_VFE1_UB_SIZE / 3)
 
-static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
+static void vfe_hw_version_read(struct vfe_device *vfe)
 {
        u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION);
 
-       dev_dbg(dev, "VFE HW Version = 0x%08x\n", hw_version);
+       dev_dbg(vfe->camss->dev, "VFE HW Version = 0x%08x\n", hw_version);
 }
 
 static u16 vfe_get_ub_size(u8 vfe_id)

diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-8.c b/drivers/media/platform/qcom/camss/camss-vfe-4-8.c
index 03f92a6737b0f03ebeaaa4d746c863c1a6b744a3..b897f5163c5da380e158833d71f468e6e37dfc04 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe-4-8.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-4-8.c
@@ -247,11 +247,11 @@
 #define MSM_VFE_VFE1_UB_SIZE 1535
 #define MSM_VFE_VFE1_UB_SIZE_RDI (MSM_VFE_VFE1_UB_SIZE / 3)
 
-static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)
+static void vfe_hw_version_read(struct vfe_device *vfe)
 {
        u32 hw_version = readl_relaxed(vfe->base + VFE_0_HW_VERSION);
 
-       dev_dbg(dev, "VFE HW Version = 0x%08x\n", hw_version);
+       dev_dbg(vfe->camss->dev, "VFE HW Version = 0x%08x\n", hw_version);
 }
 
 static inline void vfe_reg_clr(struct vfe_device *vfe, u32 reg, u32 clr_bits)

diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
index f6e889c1598ebfbdf6e8542a6ae3179d819eca6c..9b4f8136759c98cfb25d0a7c47fabae84d9ac189 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -1299,7 +1299,7 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
                return -EINVAL;
        }
        vfe->ops->subdev_init(dev, vfe);
-       vfe->ops->hw_version_read(vfe, dev);
+       vfe->ops->hw_version_read(vfe);
 
        /* Memory */
 

diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h
index 844b9275031d90b61a2d35c84007eb4e5d3bf58f..cca251816d284eceec101ddfc7553798e693260e 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe.h
+++ b/drivers/media/platform/qcom/camss/camss-vfe.h
@@ -103,7 +103,7 @@ struct vfe_device;
 struct vfe_hw_ops {
        void (*enable_irq_common)(struct vfe_device *vfe);
        void (*global_reset)(struct vfe_device *vfe);
-       void (*hw_version_read)(struct vfe_device *vfe, struct device *dev);
+       void (*hw_version_read)(struct vfe_device *vfe);
        irqreturn_t (*isr)(int irq, void *dev);
        void (*isr_read)(struct vfe_device *vfe, u32 *value0, u32 *value1);
        void (*pm_domain_off)(struct vfe_device *vfe);