media: qcom: camss: Rename camss struct resources to camss_subdev_resources

Rename non-specific struct resources {} to struct camss_subdev_resources {}

Each logical block in CAMSS has a number of regulators, clocks and resets
associated with it. We represent these blocks as v4l subdevices.

The name "struct camss_subdev_resources" is a more descriptive and accurate
name.

Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
index 9d7fb1adebb98ea0403b319847d1146906cdcfdd..b1113decdb30578e77e20c3d866cefe49cc18e6c 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -566,7 +566,7 @@ static const struct v4l2_ctrl_ops csid_ctrl_ops = {
  * Return 0 on success or a negative error code otherwise
  */
 int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
-                        const struct resources *res, u8 id)
+                        const struct camss_subdev_resources *res, u8 id)
 {
        struct device *dev = camss->dev;
        struct platform_device *pdev = to_platform_device(dev);

diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
index d4b48432a0973b2e2eda671871ce2a4fd03182e9..30d94eb2eb041af772e72ac9e62d22086a185dcb 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csid.h
+++ b/drivers/media/platform/qcom/camss/camss-csid.h
@@ -172,7 +172,7 @@ struct csid_device {
        const struct csid_hw_ops *ops;
 };
 
-struct resources;
+struct camss_subdev_resources;
 
 /*
  * csid_find_code - Find a format code in an array using array index or format code
@@ -200,7 +200,7 @@ const struct csid_format *csid_get_fmt_entry(const struct csid_format *formats,
                                             u32 code);
 
 int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
-                        const struct resources *res, u8 id);
+                        const struct camss_subdev_resources *res, u8 id);
 
 int msm_csid_register_entity(struct csid_device *csid,
                             struct v4l2_device *v4l2_dev);

diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
index c5ae9c61ee0b1b940248fea3da18cda667ab757c..b1b6c4cf183851bc17a04d523e1edace9d115c5d 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csiphy.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
@@ -546,7 +546,7 @@ static int csiphy_init_formats(struct v4l2_subdev *sd,
  */
 int msm_csiphy_subdev_init(struct camss *camss,
                           struct csiphy_device *csiphy,
-                          const struct resources *res, u8 id)
+                          const struct camss_subdev_resources *res, u8 id)
 {
        struct device *dev = camss->dev;
        struct platform_device *pdev = to_platform_device(dev);

diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.h b/drivers/media/platform/qcom/camss/camss-csiphy.h
index 1c14947f92d35a683e3e62a8ebb2e688492f71c4..c9b7fe82b1f0d71de9027cbc9132af871054b193 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csiphy.h
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.h
@@ -83,11 +83,11 @@ struct csiphy_device {
        unsigned int nformats;
 };
 
-struct resources;
+struct camss_subdev_resources;
 
 int msm_csiphy_subdev_init(struct camss *camss,
                           struct csiphy_device *csiphy,
-                          const struct resources *res, u8 id);
+                          const struct camss_subdev_resources *res, u8 id);
 
 int msm_csiphy_register_entity(struct csiphy_device *csiphy,
                               struct v4l2_device *v4l2_dev);

diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/media/platform/qcom/camss/camss-ispif.c
index 61765b874b9a25b8371ea4a67176ec3936a98381..75b8a60806b226d6a4aea686e25ae0570d6ca640 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-ispif.c
+++ b/drivers/media/platform/qcom/camss/camss-ispif.c
@@ -1095,7 +1095,7 @@ static int ispif_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
  * Return 0 on success or a negative error code otherwise
  */
 int msm_ispif_subdev_init(struct camss *camss,
-                         const struct resources *res)
+                         const struct camss_subdev_resources *res)
 {
        struct device *dev = camss->dev;
        struct ispif_device *ispif = camss->ispif;

diff --git a/drivers/media/platform/qcom/camss/camss-ispif.h b/drivers/media/platform/qcom/camss/camss-ispif.h
index c7c41f7afcaada7bfd519d7995b9a26709897392..dff6d5b35c72ed7e7c94b485d50acab2d614feb7 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-ispif.h
+++ b/drivers/media/platform/qcom/camss/camss-ispif.h
@@ -66,10 +66,10 @@ struct ispif_device {
        struct camss *camss;
 };
 
-struct resources;
+struct camss_subdev_resources;
 
 int msm_ispif_subdev_init(struct camss *camss,
-                         const struct resources *res);
+                         const struct camss_subdev_resources *res);
 
 int msm_ispif_register_entities(struct ispif_device *ispif,
                                struct v4l2_device *v4l2_dev);

diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
index b021f81cef1234b4ec51ad71bd2b41b9095e1e99..e84dcf0f4b2dae052285b126f657c9cbaca9315c 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -1279,7 +1279,7 @@ static int vfe_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
  * Return 0 on success or a negative error code otherwise
  */
 int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
-                       const struct resources *res, u8 id)
+                       const struct camss_subdev_resources *res, u8 id)
 {
        struct device *dev = camss->dev;
        struct platform_device *pdev = to_platform_device(dev);

diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h
index cbc314c4e244b4a20e4dae4b6f100fbfb4ae472c..b4bae9f65c68fea4f57fcc89426045d114bda9d5 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe.h
+++ b/drivers/media/platform/qcom/camss/camss-vfe.h
@@ -153,10 +153,10 @@ struct vfe_device {
        struct camss_video_ops video_ops;
 };
 
-struct resources;
+struct camss_subdev_resources;
 
 int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
-                       const struct resources *res, u8 id);
+                       const struct camss_subdev_resources *res, u8 id);
 
 int msm_vfe_register_entities(struct vfe_device *vfe,
                              struct v4l2_device *v4l2_dev);

diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index fa0eb30d77c26a1e51703113c14dcf2482d8c82a..718ef8e4f5938616f3d69cae2be73b1fadeeef7a 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -31,7 +31,7 @@
 #define CAMSS_CLOCK_MARGIN_NUMERATOR 105
 #define CAMSS_CLOCK_MARGIN_DENOMINATOR 100
 
-static const struct resources csiphy_res_8x16[] = {
+static const struct camss_subdev_resources csiphy_res_8x16[] = {
        /* CSIPHY0 */
        {
                .regulators = {},
@@ -57,7 +57,7 @@ static const struct resources csiphy_res_8x16[] = {
        }
 };
 
-static const struct resources csid_res_8x16[] = {
+static const struct camss_subdev_resources csid_res_8x16[] = {
        /* CSID0 */
        {
                .regulators = { "vdda" },
@@ -93,7 +93,7 @@ static const struct resources csid_res_8x16[] = {
        },
 };
 
-static const struct resources ispif_res_8x16 = {
+static const struct camss_subdev_resources ispif_res_8x16 = {
        /* ISPIF */
        .clock = { "top_ahb", "ahb", "ispif_ahb",
                   "csi0", "csi0_pix", "csi0_rdi",
@@ -104,7 +104,7 @@ static const struct resources ispif_res_8x16 = {
 
 };
 
-static const struct resources vfe_res_8x16[] = {
+static const struct camss_subdev_resources vfe_res_8x16[] = {
        /* VFE0 */
        {
                .regulators = {},
@@ -126,7 +126,7 @@ static const struct resources vfe_res_8x16[] = {
        }
 };
 
-static const struct resources csiphy_res_8x96[] = {
+static const struct camss_subdev_resources csiphy_res_8x96[] = {
        /* CSIPHY0 */
        {
                .regulators = {},
@@ -164,7 +164,7 @@ static const struct resources csiphy_res_8x96[] = {
        }
 };
 
-static const struct resources csid_res_8x96[] = {
+static const struct camss_subdev_resources csid_res_8x96[] = {
        /* CSID0 */
        {
                .regulators = { "vdda" },
@@ -234,7 +234,7 @@ static const struct resources csid_res_8x96[] = {
        }
 };
 
-static const struct resources ispif_res_8x96 = {
+static const struct camss_subdev_resources ispif_res_8x96 = {
        /* ISPIF */
        .clock = { "top_ahb", "ahb", "ispif_ahb",
                   "csi0", "csi0_pix", "csi0_rdi",
@@ -246,7 +246,7 @@ static const struct resources ispif_res_8x96 = {
        .interrupt = { "ispif" }
 };
 
-static const struct resources vfe_res_8x96[] = {
+static const struct camss_subdev_resources vfe_res_8x96[] = {
        /* VFE0 */
        {
                .regulators = {},
@@ -284,7 +284,7 @@ static const struct resources vfe_res_8x96[] = {
        }
 };
 
-static const struct resources csiphy_res_660[] = {
+static const struct camss_subdev_resources csiphy_res_660[] = {
        /* CSIPHY0 */
        {
                .regulators = {},
@@ -328,7 +328,7 @@ static const struct resources csiphy_res_660[] = {
        }
 };
 
-static const struct resources csid_res_660[] = {
+static const struct camss_subdev_resources csid_res_660[] = {
        /* CSID0 */
        {
                .regulators = { "vdda", "vdd_sec" },
@@ -410,7 +410,7 @@ static const struct resources csid_res_660[] = {
        }
 };
 
-static const struct resources ispif_res_660 = {
+static const struct camss_subdev_resources ispif_res_660 = {
        /* ISPIF */
        .clock = { "top_ahb", "ahb", "ispif_ahb",
                   "csi0", "csi0_pix", "csi0_rdi",
@@ -422,7 +422,7 @@ static const struct resources ispif_res_660 = {
        .interrupt = { "ispif" }
 };
 
-static const struct resources vfe_res_660[] = {
+static const struct camss_subdev_resources vfe_res_660[] = {
        /* VFE0 */
        {
                .regulators = {},
@@ -466,7 +466,7 @@ static const struct resources vfe_res_660[] = {
        }
 };
 
-static const struct resources csiphy_res_845[] = {
+static const struct camss_subdev_resources csiphy_res_845[] = {
        /* CSIPHY0 */
        {
                .regulators = {},
@@ -540,7 +540,7 @@ static const struct resources csiphy_res_845[] = {
        }
 };
 
-static const struct resources csid_res_845[] = {
+static const struct camss_subdev_resources csid_res_845[] = {
        /* CSID0 */
        {
                .regulators = { "vdda-phy", "vdda-pll" },
@@ -602,7 +602,7 @@ static const struct resources csid_res_845[] = {
        }
 };
 
-static const struct resources vfe_res_845[] = {
+static const struct camss_subdev_resources vfe_res_845[] = {
        /* VFE0 */
        {
                .regulators = {},
@@ -663,7 +663,7 @@ static const struct resources vfe_res_845[] = {
        }
 };
 
-static const struct resources csiphy_res_8250[] = {
+static const struct camss_subdev_resources csiphy_res_8250[] = {
        /* CSIPHY0 */
        {
                .regulators = {},
@@ -720,7 +720,7 @@ static const struct resources csiphy_res_8250[] = {
        }
 };
 
-static const struct resources csid_res_8250[] = {
+static const struct camss_subdev_resources csid_res_8250[] = {
        /* CSID0 */
        {
                .regulators = { "vdda-phy", "vdda-pll" },
@@ -769,7 +769,7 @@ static const struct resources csid_res_8250[] = {
        }
 };
 
-static const struct resources vfe_res_8250[] = {
+static const struct camss_subdev_resources vfe_res_8250[] = {
        /* VFE0 */
        {
                .regulators = {},
@@ -1120,10 +1120,10 @@ err_cleanup:
  */
 static int camss_init_subdevices(struct camss *camss)
 {
-       const struct resources *csiphy_res;
-       const struct resources *csid_res;
-       const struct resources *ispif_res;
-       const struct resources *vfe_res;
+       const struct camss_subdev_resources *csiphy_res;
+       const struct camss_subdev_resources *csid_res;
+       const struct camss_subdev_resources *ispif_res;
+       const struct camss_subdev_resources *vfe_res;
        unsigned int i;
        int ret;
 

diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
index e95211cdb1fd6c27a0f0d51a37f0a34f11ac6670..9d6ba7b17ff026fcb38d46a8c4c95f61ec95b8ec 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss.h
+++ b/drivers/media/platform/qcom/camss/camss.h
@@ -41,7 +41,7 @@
 
 #define CAMSS_RES_MAX 17
 
-struct resources {
+struct camss_subdev_resources {
        char *regulators[CAMSS_RES_MAX];
        char *clock[CAMSS_RES_MAX];
        char *clock_for_reset[CAMSS_RES_MAX];