From: Guennadi Liakhovetski Date: Tue, 7 Jun 2011 08:42:57 +0000 (-0300) Subject: [media] V4L: pxa_camera: remove redundant calculations X-Git-Tag: MMI-PSA29.97-13-9~18729^2~226 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a5c1cee0e63da3ed7d8bdbf85f11e4895051d890;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [media] V4L: pxa_camera: remove redundant calculations soc_camera core now performs the standard .bytesperline and .sizeimage calculations internally, no need to duplicate in drivers. Signed-off-by: Guennadi Liakhovetski Acked-by: Robert Jarzmik Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index c5b27a4cda30..bc8600b443bc 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c @@ -1498,12 +1498,6 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd, &pix->height, 32, 2048, 0, pixfmt == V4L2_PIX_FMT_YUV422P ? 4 : 0); - pix->bytesperline = soc_mbus_bytes_per_line(pix->width, - xlate->host_fmt); - if (pix->bytesperline < 0) - return pix->bytesperline; - pix->sizeimage = pix->height * pix->bytesperline; - /* limit to sensor capabilities */ mf.width = pix->width; mf.height = pix->height;