Commit ee56fa01 authored by Deepak R Varma's avatar Deepak R Varma Committed by Mauro Carvalho Chehab
Browse files

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: default avatarDeepak R Varma <drv@mailo.com>
Reviewed-by: default avatarMarco Felsch <m.felsch@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 29bd4267

drivers/staging/media/imx/imx-media-csi.c

+2 −5
Original line number Diff line number Diff line
@@ -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) {

drivers/staging/media/imx/imx-media-fim.c

+3 −5
Original line number Diff line number Diff line
@@ -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,

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)

drivers/staging/media/imx/imx-media.h

+3 −3
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ 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,

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);