media: staging: media: imx: change imx_media_fim_set_stream() to return void

At present, the function imx_media_fim_set_stream() always returns 0.
So, convert it to be a function returning void instead. Issue identified
using the returnvar.cocci Coccinelle semantic patch.

Signed-off-by: Deepak R Varma <drv@mailo.com>
Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index 5c3cc7d..44d87fe 100644 (file)
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -779,11 +779,8 @@ static int csi_start(struct csi_priv *priv)
                goto idmac_stop;
 
        /* start the frame interval monitor */
-       if (priv->fim && priv->dest == IPU_CSI_DEST_IDMAC) {
-               ret = imx_media_fim_set_stream(priv->fim, output_fi, true);
-               if (ret)
-                       goto idmac_stop;
-       }
+       if (priv->fim && priv->dest == IPU_CSI_DEST_IDMAC)
+               imx_media_fim_set_stream(priv->fim, output_fi, true);
 
        ret = ipu_csi_enable(priv->csi);
        if (ret) {

diff --git a/drivers/staging/media/imx/imx-media-fim.c b/drivers/staging/media/imx/imx-media-fim.c
index fb6590d..f456751 100644 (file)
--- a/drivers/staging/media/imx/imx-media-fim.c
+++ b/drivers/staging/media/imx/imx-media-fim.c
@@ -368,12 +368,11 @@ void imx_media_fim_eof_monitor(struct imx_media_fim *fim, ktime_t timestamp)
 }
 
 /* Called by the subdev in its s_stream callback */
-int imx_media_fim_set_stream(struct imx_media_fim *fim,
-                            const struct v4l2_fract *fi,
-                            bool on)
+void imx_media_fim_set_stream(struct imx_media_fim *fim,
+                             const struct v4l2_fract *fi,
+                             bool on)
 {
        unsigned long flags;
-       int ret = 0;
 
        v4l2_ctrl_lock(fim->ctrl[FIM_CL_ENABLE]);
 
@@ -393,7 +392,6 @@ int imx_media_fim_set_stream(struct imx_media_fim *fim,
        fim->stream_on = on;
 out:
        v4l2_ctrl_unlock(fim->ctrl[FIM_CL_ENABLE]);
-       return ret;
 }
 
 int imx_media_fim_add_controls(struct imx_media_fim *fim)

diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h
index f679249..6f9a465 100644 (file)
--- a/drivers/staging/media/imx/imx-media.h
+++ b/drivers/staging/media/imx/imx-media.h
@@ -246,9 +246,9 @@ int imx_media_dev_notifier_register(struct imx_media_dev *imxmd,
 /* imx-media-fim.c */
 struct imx_media_fim;
 void imx_media_fim_eof_monitor(struct imx_media_fim *fim, ktime_t timestamp);
-int imx_media_fim_set_stream(struct imx_media_fim *fim,
-                            const struct v4l2_fract *frame_interval,
-                            bool on);
+void imx_media_fim_set_stream(struct imx_media_fim *fim,
+                             const struct v4l2_fract *frame_interval,
+                             bool on);
 int imx_media_fim_add_controls(struct imx_media_fim *fim);
 struct imx_media_fim *imx_media_fim_init(struct v4l2_subdev *sd);
 void imx_media_fim_free(struct imx_media_fim *fim);