| Message ID | 20180302015751.25596-14-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Niklas, Thank you for the patch. On Friday, 2 March 2018 03:57:32 EET Niklas Söderlund wrote: > 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> > --- > drivers/media/platform/rcar-vin/rcar-v4l2.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c > b/drivers/media/platform/rcar-vin/rcar-v4l2.c index > cef9070884d93ba6..652b85300b4ef9db 100644 > --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c > +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c > @@ -194,10 +194,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) > @@ -232,10 +228,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) {
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c index cef9070884d93ba6..652b85300b4ef9db 100644 --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c @@ -194,10 +194,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) @@ -232,10 +228,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) {
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> --- drivers/media/platform/rcar-vin/rcar-v4l2.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)