From: Laurent Pinchart Date: Mon, 15 Feb 2021 04:26:45 +0000 (+0100) Subject: media: imx: capture: Remove unneeded variable in __capture_legacy_try_fmt X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=96fe421e8db5202b48c881d29c6379b977730d42;p=uclinux-h8%2Flinux.git 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: Laurent Pinchart Reviewed-by: Rui Miguel Silva Reviewed-by: Steve Longerbeam Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c index d782394f6cd1..1ef358eb3bd8 100644 --- a/drivers/staging/media/imx/imx-media-capture.c +++ b/drivers/staging/media/imx/imx-media-capture.c @@ -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, - PIXFMT_SEL_YUV_RGB); - if (cc_src) { + cc = imx_media_find_ipu_format(fmt_src->format.code, + PIXFMT_SEL_YUV_RGB); + 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, - PIXFMT_SEL_ANY); - if (WARN_ON(!cc_src)) + cc = imx_media_find_mbus_format(fmt_src->format.code, + PIXFMT_SEL_ANY); + if (WARN_ON(!cc)) return -EINVAL; - - cc = cc_src; } /* allow IDMAC interweave but enforce field order from source */