Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e80d125 authored by Steve Longerbeam's avatar Steve Longerbeam Committed by Mauro Carvalho Chehab
Browse files

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: default avatarSteve Longerbeam <slongerbeam@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 34ff3874

drivers/staging/media/imx/imx-ic-prpencvf.c

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

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

+3 −0
Original line number Diff line number Diff line
@@ -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);

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

+1 −6
Original line number Diff line number Diff line
@@ -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);

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

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

void imx_media_add_video_device(struct imx_media_dev *imxmd,

				struct imx_media_video_dev *vdev)

{

	mutex_lock(&imxmd->mutex);
@@ -774,7 +774,6 @@ int imx_media_add_video_device(struct imx_media_dev *imxmd, 
	list_add_tail(&vdev->list, &imxmd->vdev_list);



	mutex_unlock(&imxmd->mutex);

	return 0;

}

EXPORT_SYMBOL_GPL(imx_media_add_video_device);

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

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

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