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

Commit 8843d119 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] soc-camera: remove redundant parameter from .set_bus_param() 



The "pixfmt" parameter of the struct soc_camera_host_ops::set_bus_param()
method is redundant, because at the time, when this method is called,
pixfmt is guaranteed to be equal to icd->current_fmt->host_fmt->fourcc.
Remove this parameter and update all drivers accordingly.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 31e582e9

drivers/media/video/atmel-isi.c

+1 −1
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ static int isi_camera_querycap(struct soc_camera_host *ici, 
	return 0;

}



static int isi_camera_set_bus_param(struct soc_camera_device *icd, u32 pixfmt)

static int isi_camera_set_bus_param(struct soc_camera_device *icd)

{

	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

drivers/media/video/mx1_camera.c

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ static int mx1_camera_set_crop(struct soc_camera_device *icd, 
	return v4l2_subdev_call(sd, video, s_crop, a);

}



static int mx1_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)

static int mx1_camera_set_bus_param(struct soc_camera_device *icd)

{

	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

drivers/media/video/mx2_camera.c

+1 −2
Original line number Diff line number Diff line
@@ -766,8 +766,7 @@ static void mx27_camera_emma_buf_init(struct soc_camera_device *icd, 
			pcdev->base_emma + PRP_INTR_CNTL);

}



static int mx2_camera_set_bus_param(struct soc_camera_device *icd,

		__u32 pixfmt)

static int mx2_camera_set_bus_param(struct soc_camera_device *icd)

{

	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

drivers/media/video/mx3_camera.c

+2 −1
Original line number Diff line number Diff line
@@ -982,12 +982,13 @@ static int mx3_camera_querycap(struct soc_camera_host *ici, 
	return 0;

}



static int mx3_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)

static int mx3_camera_set_bus_param(struct soc_camera_device *icd)

{

	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

	struct mx3_camera_dev *mx3_cam = ici->priv;

	struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};

	u32 pixfmt = icd->current_fmt->host_fmt->fourcc;

	unsigned long bus_flags, common_flags;

	u32 dw, sens_conf;

	const struct soc_mbus_pixelfmt *fmt;

drivers/media/video/omap1_camera.c

+2 −2
Original line number Diff line number Diff line
@@ -1436,13 +1436,13 @@ static int omap1_cam_querycap(struct soc_camera_host *ici, 
	return 0;

}



static int omap1_cam_set_bus_param(struct soc_camera_device *icd,

		__u32 pixfmt)

static int omap1_cam_set_bus_param(struct soc_camera_device *icd)

{

	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);

	struct device *dev = icd->parent;

	struct soc_camera_host *ici = to_soc_camera_host(dev);

	struct omap1_cam_dev *pcdev = ici->priv;

	u32 pixfmt = icd->current_fmt->host_fmt->fourcc;

	const struct soc_camera_format_xlate *xlate;

	const struct soc_mbus_pixelfmt *fmt;

	struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};