[media] media: soc-camera: remove superfluous JPEG checking
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Mon, 8 Oct 2012 13:02:55 +0000 (10:02 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 20 Dec 2012 16:26:40 +0000 (14:26 -0200)
Explicit checks for the JPEG pixel format in soc_mbus_bytes_per_line() and
soc_mbus_image_size() are superfluous, because also without them these
functions will perform correctly. The former will return 0 based on
packing == SOC_MBUS_PACKING_VARIABLE and the latter will simply multiply
the user-provided line length by the image height to obtain a frame buffer
size estimate. The original version of the "media: soc_camera: don't clear
pix->sizeimage in JPEG mode" patch was correct and my amendment, adding
these two checks was superfluous.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/platform/soc_camera/soc_mediabus.c

index a397812635d6a6a05d2a0ba4606794f2566a8786..89dce097a827a57d918702b0a4cd415b48ee409e 100644 (file)
@@ -378,9 +378,6 @@ EXPORT_SYMBOL(soc_mbus_samples_per_pixel);
 
 s32 soc_mbus_bytes_per_line(u32 width, const struct soc_mbus_pixelfmt *mf)
 {
-       if (mf->fourcc == V4L2_PIX_FMT_JPEG)
-               return 0;
-
        if (mf->layout != SOC_MBUS_LAYOUT_PACKED)
                return width * mf->bits_per_sample / 8;
 
@@ -403,9 +400,6 @@ EXPORT_SYMBOL(soc_mbus_bytes_per_line);
 s32 soc_mbus_image_size(const struct soc_mbus_pixelfmt *mf,
                        u32 bytes_per_line, u32 height)
 {
-       if (mf->fourcc == V4L2_PIX_FMT_JPEG)
-               return 0;
-
        if (mf->layout == SOC_MBUS_LAYOUT_PACKED)
                return bytes_per_line * height;