From 72070921a8020b49cb35cacf2382dc185888b8d5 Mon Sep 17 00:00:00 2001 From: Fancy Fang Date: Mon, 30 Nov 2015 10:19:35 +0800 Subject: [PATCH] MLK-11917-1 media: output: pxp_v4l2: remove some duplicate dead code The code slice in the 'v4l2_fmt_to_pxp_fmt()' function: " else if (v4l2_pix_fmt == V4L2_PIX_FMT_RGB555) pxp_fmt = PXP_PIX_FMT_RGB555; " appears twice continuously. And the second code slice will become dead code which is never executed. So remove the second one. Signed-off-by: Fancy Fang --- drivers/media/platform/mxc/output/mxc_pxp_v4l2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c b/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c index 005bb9262b53..7d89d32ea305 100644 --- a/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c +++ b/drivers/media/platform/mxc/output/mxc_pxp_v4l2.c @@ -110,8 +110,6 @@ static unsigned int v4l2_fmt_to_pxp_fmt(u32 v4l2_pix_fmt) pxp_fmt = PXP_PIX_FMT_RGB565; else if (v4l2_pix_fmt == V4L2_PIX_FMT_RGB555) pxp_fmt = PXP_PIX_FMT_RGB555; - else if (v4l2_pix_fmt == V4L2_PIX_FMT_RGB555) - pxp_fmt = PXP_PIX_FMT_RGB555; else if (v4l2_pix_fmt == V4L2_PIX_FMT_YUV420) pxp_fmt = PXP_PIX_FMT_YUV420P; else if (v4l2_pix_fmt == V4L2_PIX_FMT_YUV422P) -- 2.17.1