media: rcar-vin: update bytesperline and sizeimage calculation

Remove over complicated logic to calculate the value for bytesperline
and sizeimage that was carried over from the soc_camera port. There is
no need to find the max value of bytesperline and sizeimage from
user-space as they are set to 0 before the max_t() operation.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
index ce50bc29b29a16ef5ecf14676fcf30171d0beb5d..05dd5d9256b9752a10c7fca476bb457f94f82ace 100644 (file)
--- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
+++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
@@ -196,10 +196,6 @@ static int __rvin_try_format(struct rvin_dev *vin,
                pix->pixelformat = RVIN_DEFAULT_FORMAT;
        }
 
-       /* Always recalculate */
-       pix->bytesperline = 0;
-       pix->sizeimage = 0;
-
        /* Limit to source capabilities */
        ret = __rvin_try_format_source(vin, which, pix, source);
        if (ret)
@@ -234,10 +230,8 @@ static int __rvin_try_format(struct rvin_dev *vin,
        v4l_bound_align_image(&pix->width, 2, vin->info->max_width, walign,
                              &pix->height, 4, vin->info->max_height, 2, 0);
 
-       pix->bytesperline = max_t(u32, pix->bytesperline,
-                                 rvin_format_bytesperline(pix));
-       pix->sizeimage = max_t(u32, pix->sizeimage,
-                              rvin_format_sizeimage(pix));
+       pix->bytesperline = rvin_format_bytesperline(pix);
+       pix->sizeimage = rvin_format_sizeimage(pix);
 
        if (vin->info->model == RCAR_M1 &&
            pix->pixelformat == V4L2_PIX_FMT_XBGR32) {