Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cea4c9e4 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] media: soc-camera: remove superfluous JPEG checking 



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: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 454547fb

drivers/media/platform/soc_camera/soc_mediabus.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -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)

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)

	if (mf->layout != SOC_MBUS_LAYOUT_PACKED)

		return width * mf->bits_per_sample / 8;

		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,

s32 soc_mbus_image_size(const struct soc_mbus_pixelfmt *mf,

			u32 bytes_per_line, u32 height)

			u32 bytes_per_line, u32 height)

{

{

	if (mf->fourcc == V4L2_PIX_FMT_JPEG)

		return 0;



	if (mf->layout == SOC_MBUS_LAYOUT_PACKED)

	if (mf->layout == SOC_MBUS_LAYOUT_PACKED)

		return bytes_per_line * height;

		return bytes_per_line * height;