Commit eef98882 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: imx: utils: Rename format lookup and enumeration functions 



Rename the format lookup and enumeration functions according to their
usage:

- Rename imx_media_(find|enum)_format() to *_pixel_format() to
  explicitly state on what formats the functions operate. This aligns
  the naming scheme with the media bus and IPU format functions that
  already end with *_mbus_format() and *_ipu_formats().

- Rename all enumeration functions to pluralize 'formats' at the end, as
  they enumerate multiple formats.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 74cd3984

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

+6 −5
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static int prp_enum_mbus_code(struct v4l2_subdev *sd, 


	switch (code->pad) {

	case PRP_SINK_PAD:

		ret = imx_media_enum_ipu_format(&code->code, code->index,

		ret = imx_media_enum_ipu_formats(&code->code, code->index,

						 PIXFMT_SEL_YUV_RGB);

		break;

	case PRP_SRC_PAD_PRPENC:
@@ -182,7 +182,7 @@ static int prp_set_fmt(struct v4l2_subdev *sd, 
		cc = imx_media_find_ipu_format(sdformat->format.code,

					       PIXFMT_SEL_YUV_RGB);

		if (!cc) {

			imx_media_enum_ipu_format(&code, 0,

			imx_media_enum_ipu_formats(&code, 0,

						   PIXFMT_SEL_YUV_RGB);

			cc = imx_media_find_ipu_format(code,

						       PIXFMT_SEL_YUV_RGB);
@@ -440,7 +440,8 @@ static int prp_registered(struct v4l2_subdev *sd) 
	priv->frame_interval.denominator = 30;



	/* set a default mbus format  */

	imx_media_enum_ipu_format(&code, 0, PIXFMT_SEL_YUV);

	imx_media_enum_ipu_formats(&code, 0, PIXFMT_SEL_YUV);



	return imx_media_init_mbus_fmt(&priv->format_mbus, 640, 480, code,

				       V4L2_FIELD_NONE, NULL);

}

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

+5 −4
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ static int prp_enum_mbus_code(struct v4l2_subdev *sd, 
	if (code->pad >= PRPENCVF_NUM_PADS)

		return -EINVAL;



	return imx_media_enum_ipu_format(&code->code, code->index,

	return imx_media_enum_ipu_formats(&code->code, code->index,

					  PIXFMT_SEL_YUV_RGB);

}
@@ -891,7 +891,7 @@ static void prp_try_fmt(struct prp_priv *priv, 
	if (!*cc) {

		u32 code;



		imx_media_enum_ipu_format(&code, 0, PIXFMT_SEL_YUV_RGB);

		imx_media_enum_ipu_formats(&code, 0, PIXFMT_SEL_YUV_RGB);

		*cc = imx_media_find_ipu_format(code, PIXFMT_SEL_YUV_RGB);



		sdformat->format.code = (*cc)->codes[0];
@@ -1251,7 +1251,8 @@ static int prp_registered(struct v4l2_subdev *sd) 
	u32 code;



	/* set a default mbus format  */

	imx_media_enum_ipu_format(&code, 0, PIXFMT_SEL_YUV);

	imx_media_enum_ipu_formats(&code, 0, PIXFMT_SEL_YUV);



	for (i = 0; i < PRPENCVF_NUM_PADS; i++) {

		ret = imx_media_init_mbus_fmt(&priv->format_mbus[i],

					      640, 480, code, V4L2_FIELD_NONE,

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

+8 −8
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int capture_enum_framesizes(struct file *file, void *fh, 
	};

	int ret;



	cc = imx_media_find_format(fsize->pixel_format, PIXFMT_SEL_ANY);

	cc = imx_media_find_pixel_format(fsize->pixel_format, PIXFMT_SEL_ANY);

	if (!cc)

		return -EINVAL;
@@ -133,7 +133,7 @@ static int capture_enum_frameintervals(struct file *file, void *fh, 
	};

	int ret;



	cc = imx_media_find_format(fival->pixel_format, PIXFMT_SEL_ANY);

	cc = imx_media_find_pixel_format(fival->pixel_format, PIXFMT_SEL_ANY);

	if (!cc)

		return -EINVAL;
@@ -174,7 +174,7 @@ static int capture_enum_fmt_vid_cap(struct file *file, void *fh, 
			(cc_src->cs == IPUV3_COLORSPACE_YUV) ?

			PIXFMT_SEL_YUV : PIXFMT_SEL_RGB;



		ret = imx_media_enum_format(&fourcc, f->index, fmt_sel);

		ret = imx_media_enum_pixel_formats(&fourcc, f->index, fmt_sel);

		if (ret)

			return ret;

	} else {
@@ -221,10 +221,10 @@ static int __capture_try_fmt_vid_cap(struct capture_priv *priv, 
			PIXFMT_SEL_YUV : PIXFMT_SEL_RGB;

		fourcc = f->fmt.pix.pixelformat;



		cc = imx_media_find_format(fourcc, fmt_sel);

		cc = imx_media_find_pixel_format(fourcc, fmt_sel);

		if (!cc) {

			imx_media_enum_format(&fourcc, 0, fmt_sel);

			cc = imx_media_find_format(fourcc, fmt_sel);

			imx_media_enum_pixel_formats(&fourcc, 0, fmt_sel);

			cc = imx_media_find_pixel_format(fourcc, fmt_sel);

		}

	} else {

		cc_src = imx_media_find_mbus_format(fmt_src->format.code,
@@ -793,7 +793,7 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev) 
				      &fmt_src.format, NULL);

	vdev->compose.width = fmt_src.format.width;

	vdev->compose.height = fmt_src.format.height;

	vdev->cc = imx_media_find_format(vdev->fmt.fmt.pix.pixelformat,

	vdev->cc = imx_media_find_pixel_format(vdev->fmt.fmt.pix.pixelformat,

					       PIXFMT_SEL_ANY);



	v4l2_info(sd, "Registered %s as /dev/%s\n", vfd->name,

drivers/staging/media/imx/imx-media-csc-scaler.c

+2 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ static int ipu_csc_scaler_enum_fmt(struct file *file, void *fh, 
	u32 fourcc;

	int ret;



	ret = imx_media_enum_format(&fourcc, f->index, PIXFMT_SEL_YUV_RGB);

	ret = imx_media_enum_pixel_formats(&fourcc, f->index,

					   PIXFMT_SEL_YUV_RGB);

	if (ret)

		return ret;

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

+9 −9
Original line number Diff line number Diff line
@@ -1238,7 +1238,7 @@ static int csi_enum_mbus_code(struct v4l2_subdev *sd, 


	switch (code->pad) {

	case CSI_SINK_PAD:

		ret = imx_media_enum_mbus_format(&code->code, code->index,

		ret = imx_media_enum_mbus_formats(&code->code, code->index,

						  PIXFMT_SEL_ANY);

		break;

	case CSI_SRC_PAD_DIRECT:
@@ -1260,7 +1260,7 @@ static int csi_enum_mbus_code(struct v4l2_subdev *sd, 
				(incc->cs == IPUV3_COLORSPACE_YUV) ?

				PIXFMT_SEL_YUV : PIXFMT_SEL_RGB;



			ret = imx_media_enum_ipu_format(&code->code,

			ret = imx_media_enum_ipu_formats(&code->code,

							 code->index,

							 fmt_sel);

		}
@@ -1451,7 +1451,7 @@ static void csi_try_fmt(struct csi_priv *priv, 
			*cc = imx_media_find_ipu_format(sdformat->format.code,

							fmt_sel);

			if (!*cc) {

				imx_media_enum_ipu_format(&code, 0, fmt_sel);

				imx_media_enum_ipu_formats(&code, 0, fmt_sel);

				*cc = imx_media_find_ipu_format(code, fmt_sel);

				sdformat->format.code = (*cc)->codes[0];

			}
@@ -1474,7 +1474,7 @@ static void csi_try_fmt(struct csi_priv *priv, 
		*cc = imx_media_find_mbus_format(sdformat->format.code,

						 PIXFMT_SEL_ANY);

		if (!*cc) {

			imx_media_enum_mbus_format(&code, 0,

			imx_media_enum_mbus_formats(&code, 0,

						    PIXFMT_SEL_YUV_RGB);

			*cc = imx_media_find_mbus_format(code,

							 PIXFMT_SEL_YUV_RGB);
@@ -1763,7 +1763,7 @@ static int csi_registered(struct v4l2_subdev *sd) 
	for (i = 0; i < CSI_NUM_PADS; i++) {

		code = 0;

		if (i != CSI_SINK_PAD)

			imx_media_enum_ipu_format(&code, 0, PIXFMT_SEL_YUV);

			imx_media_enum_ipu_formats(&code, 0, PIXFMT_SEL_YUV);



		/* set a default mbus format  */

		ret = imx_media_init_mbus_fmt(&priv->format_mbus[i],