media: staging/imx: Move add_video_device into capture_device_register

Move imx_media_add_video_device() into imx_media_capture_device_register().
Also the former has no error conditions to convert to void.

Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/staging/media/imx/imx-ic-prpencvf.c b/drivers/staging/media/imx/imx-ic-prpencvf.c
index 25d926a..f01a9c4 100644 (file)
--- a/drivers/staging/media/imx/imx-ic-prpencvf.c
+++ b/drivers/staging/media/imx/imx-ic-prpencvf.c
@@ -1237,7 +1237,6 @@ static int prp_s_frame_interval(struct v4l2_subdev *sd,
 static int prp_registered(struct v4l2_subdev *sd)
 {
        struct prp_priv *priv = sd_to_priv(sd);
-       struct imx_ic_priv *ic_priv = priv->ic_priv;
        int i, ret;
        u32 code;
 
@@ -1267,10 +1266,6 @@ static int prp_registered(struct v4l2_subdev *sd)
        if (ret)
                return ret;
 
-       ret = imx_media_add_video_device(ic_priv->md, priv->vdev);
-       if (ret)
-               goto unreg;
-
        ret = prp_init_controls(priv);
        if (ret)
                goto unreg;

diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c
index a70ad3b..50c3d3b 100644 (file)
--- a/drivers/staging/media/imx/imx-media-capture.c
+++ b/drivers/staging/media/imx/imx-media-capture.c
@@ -774,6 +774,9 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev)
 
        vfd->ctrl_handler = &priv->ctrl_hdlr;
 
+       /* add vdev to the video device list */
+       imx_media_add_video_device(priv->md, vdev);
+
        return 0;
 unreg:
        video_unregister_device(vfd);

diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index 74aa494..c44eb35 100644 (file)
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -1816,13 +1816,8 @@ static int csi_registered(struct v4l2_subdev *sd)
        if (ret)
                goto free_fim;
 
-       ret = imx_media_add_video_device(priv->md, priv->vdev);
-       if (ret)
-               goto unreg;
-
        return 0;
-unreg:
-       imx_media_capture_device_unregister(priv->vdev);
+
 free_fim:
        if (priv->fim)
                imx_media_fim_free(priv->fim);

diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c
index 4d6e75a..9318b88 100644 (file)
--- a/drivers/staging/media/imx/imx-media-utils.c
+++ b/drivers/staging/media/imx/imx-media-utils.c
@@ -763,18 +763,17 @@ imx_media_find_subdev_by_devname(struct imx_media_dev *imxmd,
 EXPORT_SYMBOL_GPL(imx_media_find_subdev_by_devname);
 
 /*
- * Adds a video device to the master video device list. This is called by
- * an async subdev that owns a video device when it is registered.
+ * Adds a video device to the master video device list. This is called
+ * when a video device is registered.
  */
-int imx_media_add_video_device(struct imx_media_dev *imxmd,
-                              struct imx_media_video_dev *vdev)
+void imx_media_add_video_device(struct imx_media_dev *imxmd,
+                               struct imx_media_video_dev *vdev)
 {
        mutex_lock(&imxmd->mutex);
 
        list_add_tail(&vdev->list, &imxmd->vdev_list);
 
        mutex_unlock(&imxmd->mutex);
-       return 0;
 }
 EXPORT_SYMBOL_GPL(imx_media_add_video_device);
 

diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h
index 1711ced..0585bf7 100644 (file)
--- a/drivers/staging/media/imx/imx-media.h
+++ b/drivers/staging/media/imx/imx-media.h
@@ -185,8 +185,8 @@ imx_media_find_subdev_by_fwnode(struct imx_media_dev *imxmd,
 struct v4l2_subdev *
 imx_media_find_subdev_by_devname(struct imx_media_dev *imxmd,
                                 const char *devname);
-int imx_media_add_video_device(struct imx_media_dev *imxmd,
-                              struct imx_media_video_dev *vdev);
+void imx_media_add_video_device(struct imx_media_dev *imxmd,
+                               struct imx_media_video_dev *vdev);
 int imx_media_find_mipi_csi2_channel(struct imx_media_dev *imxmd,
                                     struct media_entity *start_entity);
 struct media_pad *

diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index 96d01d8..f2037ab 100644 (file)
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -1126,17 +1126,7 @@ static int imx7_csi_registered(struct v4l2_subdev *sd)
        if (ret < 0)
                return ret;
 
-       ret = imx_media_capture_device_register(csi->vdev);
-       if (ret < 0)
-               return ret;
-
-       ret = imx_media_add_video_device(csi->imxmd, csi->vdev);
-       if (ret < 0) {
-               imx_media_capture_device_unregister(csi->vdev);
-               return ret;
-       }
-
-       return 0;
+       return imx_media_capture_device_register(csi->vdev);
 }
 
 static void imx7_csi_unregistered(struct v4l2_subdev *sd)