From: Philipp Zabel Date: Thu, 28 Jun 2018 10:57:53 +0000 (-0400) Subject: media: coda: streamline framebuffer size calculation a bit X-Git-Tag: v4.19-rc1~137^2~216 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9e49ca530eebd6775410317aac8a68f88171f89c;p=uclinux-h8%2Flinux.git media: coda: streamline framebuffer size calculation a bit Remove the intermediate width and height variables, the calculation is simple enough. Signed-off-by: Philipp Zabel Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c index 033abb03722b..bf8d8489f827 100644 --- a/drivers/media/platform/coda/coda-bit.c +++ b/drivers/media/platform/coda/coda-bit.c @@ -390,7 +390,6 @@ static int coda_alloc_framebuffers(struct coda_ctx *ctx, struct coda_q_data *q_data, u32 fourcc) { struct coda_dev *dev = ctx->dev; - int width, height; unsigned int ysize, ycbcr_size; int ret; int i; @@ -398,14 +397,11 @@ static int coda_alloc_framebuffers(struct coda_ctx *ctx, if (ctx->codec->src_fourcc == V4L2_PIX_FMT_H264 || ctx->codec->dst_fourcc == V4L2_PIX_FMT_H264 || ctx->codec->src_fourcc == V4L2_PIX_FMT_MPEG4 || - ctx->codec->dst_fourcc == V4L2_PIX_FMT_MPEG4) { - width = round_up(q_data->width, 16); - height = round_up(q_data->height, 16); - } else { - width = round_up(q_data->width, 8); - height = q_data->height; - } - ysize = width * height; + ctx->codec->dst_fourcc == V4L2_PIX_FMT_MPEG4) + ysize = round_up(q_data->width, 16) * + round_up(q_data->height, 16); + else + ysize = round_up(q_data->width, 8) * q_data->height; if (ctx->tiled_map_type == GDI_TILED_FRAME_MB_RASTER_MAP) ycbcr_size = round_up(ysize, 4096) + ysize / 2;