[media] marvell-ccic: drop V4L2_PIX_FMT_JPEG dead code
authorHans Verkuil <hans.verkuil@cisco.com>
Mon, 9 Mar 2015 20:02:41 +0000 (17:02 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Fri, 1 May 2015 10:48:49 +0000 (07:48 -0300)
This driver appeared to support the JPEG format when in reality
that was just dead code. Remove it.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/platform/marvell-ccic/mcam-core.c

index 2495ab662698af6eb8dd6c6c2156eceb1626957b..1a326102791fec6fc6607d358cc01cd22a9490d7 100644 (file)
@@ -755,11 +755,6 @@ static void mcam_ctlr_image(struct mcam_camera *cam)
                widthy = fmt->width * 2;
                widthuv = 0;
                break;
-       case V4L2_PIX_FMT_JPEG:
-               imgsz_h = (fmt->sizeimage / fmt->bytesperline) << IMGSZ_V_SHIFT;
-               widthy = fmt->bytesperline;
-               widthuv = 0;
-               break;
        case V4L2_PIX_FMT_YUV422P:
        case V4L2_PIX_FMT_YUV420:
        case V4L2_PIX_FMT_YVU420:
@@ -797,10 +792,6 @@ static void mcam_ctlr_image(struct mcam_camera *cam)
                mcam_reg_write_mask(cam, REG_CTRL0,
                        C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_YUYV, C0_DF_MASK);
                break;
-       case V4L2_PIX_FMT_JPEG:
-               mcam_reg_write_mask(cam, REG_CTRL0,
-                       C0_DF_YUV | C0_YUV_PACKED | C0_YUVE_YUYV, C0_DF_MASK);
-               break;
        case V4L2_PIX_FMT_RGB444:
                mcam_reg_write_mask(cam, REG_CTRL0,
                        C0_DF_RGB | C0_RGBF_444 | C0_RGB4_XRGB, C0_DF_MASK);