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

media: imx: capture: Remove unneeded variable in __capture_legacy_try_fmt 



The __capture_legacy_try_fmt() function doesn't need two
imx_media_pixfmt pointer variables. Remove one of them.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Reviewed-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+huawei@kernel.org>
parent 49e1b5d6

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

+9 −11
Original line number Diff line number Diff line
@@ -236,16 +236,16 @@ static int __capture_legacy_try_fmt(struct capture_priv *priv, 
				    const struct imx_media_pixfmt **retcc,

				    struct v4l2_rect *compose)

{

	const struct imx_media_pixfmt *cc, *cc_src;

	const struct imx_media_pixfmt *cc;



	cc_src = imx_media_find_ipu_format(fmt_src->format.code,

	cc = imx_media_find_ipu_format(fmt_src->format.code,

				       PIXFMT_SEL_YUV_RGB);

	if (cc_src) {

	if (cc) {

		enum imx_pixfmt_sel fmt_sel;

		u32 fourcc;



		fmt_sel = (cc_src->cs == IPUV3_COLORSPACE_YUV) ?

			PIXFMT_SEL_YUV : PIXFMT_SEL_RGB;

		fmt_sel = (cc->cs == IPUV3_COLORSPACE_YUV)

			? PIXFMT_SEL_YUV : PIXFMT_SEL_RGB;

		fourcc = f->fmt.pix.pixelformat;



		cc = imx_media_find_pixel_format(fourcc, fmt_sel);
@@ -254,12 +254,10 @@ static int __capture_legacy_try_fmt(struct capture_priv *priv, 
			cc = imx_media_find_pixel_format(fourcc, fmt_sel);

		}

	} else {

		cc_src = imx_media_find_mbus_format(fmt_src->format.code,

		cc = imx_media_find_mbus_format(fmt_src->format.code,

						PIXFMT_SEL_ANY);

		if (WARN_ON(!cc_src))

		if (WARN_ON(!cc))

			return -EINVAL;



		cc = cc_src;

	}



	/* allow IDMAC interweave but enforce field order from source */