media: imx: Rename functions that add IPU-internal subdevs

commit 085b26da62211cb77622008082adff56aefa771d upstream.

For the functions that add and remove the internal IPU subdevice
descriptors, rename them to make clear they are the subdevs internal
to the IPU. Also rename the platform data structure for the internal
IPU subdevices. No functional changes.

Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Cc: stable@vger.kernel.org
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/media/imx/imx-ic-common.c b/drivers/staging/media/imx/imx-ic-common.c
index 765919487a73e66f789f8e6d6323a25b39fdd2a3..90a926891eb97d6ef8706d26483ae4b53ab72d02 100644 (file)
--- a/drivers/staging/media/imx/imx-ic-common.c
+++ b/drivers/staging/media/imx/imx-ic-common.c
@@ -26,7 +26,7 @@ static struct imx_ic_ops *ic_ops[IC_NUM_OPS] = {
 
 static int imx_ic_probe(struct platform_device *pdev)
 {
-       struct imx_media_internal_sd_platformdata *pdata;
+       struct imx_media_ipu_internal_sd_pdata *pdata;
        struct imx_ic_priv *priv;
        int ret;
 

diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c
index 28a3d23aad5bd5d9d1d6fe4fd7b8d285d0a84d47..fc35508d939683d4ffe65737d955330be136e4d9 100644 (file)
--- a/drivers/staging/media/imx/imx-media-dev.c
+++ b/drivers/staging/media/imx/imx-media-dev.c
@@ -477,10 +477,10 @@ static int imx_media_probe(struct platform_device *pdev)
                goto cleanup;
        }
 
-       ret = imx_media_add_internal_subdevs(imxmd);
+       ret = imx_media_add_ipu_internal_subdevs(imxmd);
        if (ret) {
                v4l2_err(&imxmd->v4l2_dev,
-                        "add_internal_subdevs failed with %d\n", ret);
+                        "add_ipu_internal_subdevs failed with %d\n", ret);
                goto cleanup;
        }
 
@@ -491,7 +491,7 @@ static int imx_media_probe(struct platform_device *pdev)
        return 0;
 
 del_int:
-       imx_media_remove_internal_subdevs(imxmd);
+       imx_media_remove_ipu_internal_subdevs(imxmd);
 cleanup:
        v4l2_async_notifier_cleanup(&imxmd->notifier);
        v4l2_device_unregister(&imxmd->v4l2_dev);
@@ -508,7 +508,7 @@ static int imx_media_remove(struct platform_device *pdev)
        v4l2_info(&imxmd->v4l2_dev, "Removing imx-media\n");
 
        v4l2_async_notifier_unregister(&imxmd->notifier);
-       imx_media_remove_internal_subdevs(imxmd);
+       imx_media_remove_ipu_internal_subdevs(imxmd);
        v4l2_async_notifier_cleanup(&imxmd->notifier);
        media_device_unregister(&imxmd->md);
        v4l2_device_unregister(&imxmd->v4l2_dev);

diff --git a/drivers/staging/media/imx/imx-media-internal-sd.c b/drivers/staging/media/imx/imx-media-internal-sd.c
index 5e10d95e552998150b4def5315f2422c1fb8f806..e620f4adb7559733d8442c1d6129f0ee8d1fa782 100644 (file)
--- a/drivers/staging/media/imx/imx-media-internal-sd.c
+++ b/drivers/staging/media/imx/imx-media-internal-sd.c
@@ -1,7 +1,7 @@
 /*
  * Media driver for Freescale i.MX5/6 SOC
  *
- * Adds the internal subdevices and the media links between them.
+ * Adds the IPU internal subdevices and the media links between them.
  *
  * Copyright (c) 2016 Mentor Graphics Inc.
  *
@@ -192,7 +192,7 @@ static struct v4l2_subdev *find_sink(struct imx_media_dev *imxmd,
 
        /*
         * retrieve IPU id from subdev name, note: can't get this from
-        * struct imx_media_internal_sd_platformdata because if src is
+        * struct imx_media_ipu_internal_sd_pdata because if src is
         * a CSI, it has different struct ipu_client_platformdata which
         * does not contain IPU id.
         */
@@ -270,7 +270,7 @@ static int add_internal_subdev(struct imx_media_dev *imxmd,
                               const struct internal_subdev *isd,
                               int ipu_id)
 {
-       struct imx_media_internal_sd_platformdata pdata;
+       struct imx_media_ipu_internal_sd_pdata pdata;
        struct platform_device_info pdevinfo = {};
        struct platform_device *pdev;
 
@@ -328,7 +328,7 @@ static int add_ipu_internal_subdevs(struct imx_media_dev *imxmd, int ipu_id)
        return 0;
 }
 
-int imx_media_add_internal_subdevs(struct imx_media_dev *imxmd)
+int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd)
 {
        int ret;
 
@@ -343,11 +343,11 @@ int imx_media_add_internal_subdevs(struct imx_media_dev *imxmd)
        return 0;
 
 remove:
-       imx_media_remove_internal_subdevs(imxmd);
+       imx_media_remove_ipu_internal_subdevs(imxmd);
        return ret;
 }
 
-void imx_media_remove_internal_subdevs(struct imx_media_dev *imxmd)
+void imx_media_remove_ipu_internal_subdevs(struct imx_media_dev *imxmd)
 {
        struct imx_media_async_subdev *imxasd;
        struct v4l2_async_subdev *asd;

diff --git a/drivers/staging/media/imx/imx-media-vdic.c b/drivers/staging/media/imx/imx-media-vdic.c
index 2808662e2597726dc1b074f5ea0bce8ebdcd038c..8a9af4688fd4167546766f5d3d34af3e70aa01f0 100644 (file)
--- a/drivers/staging/media/imx/imx-media-vdic.c
+++ b/drivers/staging/media/imx/imx-media-vdic.c
@@ -934,7 +934,7 @@ static const struct v4l2_subdev_internal_ops vdic_internal_ops = {
 
 static int imx_vdic_probe(struct platform_device *pdev)
 {
-       struct imx_media_internal_sd_platformdata *pdata;
+       struct imx_media_ipu_internal_sd_pdata *pdata;
        struct vdic_priv *priv;
        int ret;
 

diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h
index ae964c8d5be1851166cb57a310312ba2c9186fc9..ccbfc4438c856e2a8f05f7a4f7f5abe9fbe1d423 100644 (file)
--- a/drivers/staging/media/imx/imx-media.h
+++ b/drivers/staging/media/imx/imx-media.h
@@ -115,7 +115,7 @@ struct imx_media_pad_vdev {
        struct list_head list;
 };
 
-struct imx_media_internal_sd_platformdata {
+struct imx_media_ipu_internal_sd_pdata {
        char sd_name[V4L2_SUBDEV_NAME_SIZE];
        u32 grp_id;
        int ipu_id;
@@ -252,10 +252,10 @@ struct imx_media_fim *imx_media_fim_init(struct v4l2_subdev *sd);
 void imx_media_fim_free(struct imx_media_fim *fim);
 
 /* imx-media-internal-sd.c */
-int imx_media_add_internal_subdevs(struct imx_media_dev *imxmd);
+int imx_media_add_ipu_internal_subdevs(struct imx_media_dev *imxmd);
 int imx_media_create_ipu_internal_links(struct imx_media_dev *imxmd,
                                        struct v4l2_subdev *sd);
-void imx_media_remove_internal_subdevs(struct imx_media_dev *imxmd);
+void imx_media_remove_ipu_internal_subdevs(struct imx_media_dev *imxmd);
 
 /* imx-media-of.c */
 int imx_media_add_of_subdevs(struct imx_media_dev *dev,