On Tue, 29 Oct 2019 01:24:51 +0000
Jonas Karlman <jonas@xxxxxxxxx> wrote:
> pic_size in hantro_h264_dec_hw_ctx struct is no longer used,
> lets remove it.
>
> Signed-off-by: Jonas Karlman <jonas@xxxxxxxxx>
Reviewed-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx>
> ---
> drivers/staging/media/hantro/hantro_h264.c | 5 -----
> drivers/staging/media/hantro/hantro_hw.h | 3 ---
> 2 files changed, 8 deletions(-)
>
> diff --git a/drivers/staging/media/hantro/hantro_h264.c b/drivers/staging/media/hantro/hantro_h264.c
> index 694a330f508e..568640eab3a6 100644
> --- a/drivers/staging/media/hantro/hantro_h264.c
> +++ b/drivers/staging/media/hantro/hantro_h264.c
> @@ -618,7 +618,6 @@ int hantro_h264_dec_init(struct hantro_ctx *ctx)
> struct hantro_h264_dec_hw_ctx *h264_dec = &ctx->h264_dec;
> struct hantro_aux_buf *priv = &h264_dec->priv;
> struct hantro_h264_dec_priv_tbl *tbl;
> - struct v4l2_pix_format_mplane pix_mp;
>
> priv->cpu = dma_alloc_coherent(vpu->dev, sizeof(*tbl), &priv->dma,
> GFP_KERNEL);
> @@ -629,9 +628,5 @@ int hantro_h264_dec_init(struct hantro_ctx *ctx)
> tbl = priv->cpu;
> memcpy(tbl->cabac_table, h264_cabac_table, sizeof(tbl->cabac_table));
>
> - v4l2_fill_pixfmt_mp(&pix_mp, ctx->dst_fmt.pixelformat,
> - ctx->dst_fmt.width, ctx->dst_fmt.height);
> - h264_dec->pic_size = pix_mp.plane_fmt[0].sizeimage;
> -
> return 0;
> }
> diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h
> index 69b88f4d3fb3..fa91dd1848b7 100644
> --- a/drivers/staging/media/hantro/hantro_hw.h
> +++ b/drivers/staging/media/hantro/hantro_hw.h
> @@ -80,15 +80,12 @@ struct hantro_h264_dec_reflists {
> * @dpb: DPB
> * @reflists: P/B0/B1 reflists
> * @ctrls: V4L2 controls attached to a run
> - * @pic_size: Size in bytes of decoded picture, this is needed
> - * to pass the location of motion vectors.
> */
> struct hantro_h264_dec_hw_ctx {
> struct hantro_aux_buf priv;
> struct v4l2_h264_dpb_entry dpb[HANTRO_H264_DPB_SIZE];
> struct hantro_h264_dec_reflists reflists;
> struct hantro_h264_dec_ctrls ctrls;
> - size_t pic_size;
> };
>
> /**
