Le mercredi 16 septembre 2026 à 14:54 +0200, Benjamin Gaignard a écrit : > Simplify and clean up the code by using the helpers. > > Signed-off-by: Benjamin Gaignard Reviewed-by: Nicolas Dufresne > --- > .../media/platform/verisilicon/hantro_vp8.c | 37 +++++-------------- > 1 file changed, 10 insertions(+), 27 deletions(-) > > diff --git a/drivers/media/platform/verisilicon/hantro_vp8.c b/drivers/media/platform/verisilicon/hantro_vp8.c > index 381bc1d3bfda..881e6c21f0fa 100644 > --- a/drivers/media/platform/verisilicon/hantro_vp8.c > +++ b/drivers/media/platform/verisilicon/hantro_vp8.c > @@ -144,11 +144,9 @@ void hantro_vp8_prob_update(struct hantro_ctx *ctx, > > int hantro_vp8_dec_init(struct hantro_ctx *ctx) > { > - struct hantro_dev *vpu = ctx->dev; > struct hantro_aux_buf *aux_buf; > unsigned int mb_width, mb_height; > size_t segment_map_size; > - int ret; > > /* segment map table size calculation */ > mb_width = DIV_ROUND_UP(ctx->dst_fmt.width, 16); > @@ -160,42 +158,27 @@ int hantro_vp8_dec_init(struct hantro_ctx *ctx) > * And the data in segment map buffer must be set to all zero. > */ > aux_buf = &ctx->vp8_dec.segment_map; > - aux_buf->size = segment_map_size; > - aux_buf->cpu = dma_alloc_coherent(vpu->dev, aux_buf->size, > - &aux_buf->dma, GFP_KERNEL); > - if (!aux_buf->cpu) > - return -ENOMEM; > + if (hantro_allocate_aux_buf(ctx, aux_buf, segment_map_size)) > + goto error; > > /* > * Allocate probability table buffer, > * total 1208 bytes, 4K page is far enough. > */ > aux_buf = &ctx->vp8_dec.prob_tbl; > - aux_buf->size = sizeof(struct vp8_prob_tbl_packed); > - aux_buf->cpu = dma_alloc_coherent(vpu->dev, aux_buf->size, > - &aux_buf->dma, GFP_KERNEL); > - if (!aux_buf->cpu) { > - ret = -ENOMEM; > - goto err_free_seg_map; > - } > + if (hantro_allocate_aux_buf(ctx, aux_buf, sizeof(struct vp8_prob_tbl_packed))) > + goto error; > > return 0; > > -err_free_seg_map: > - dma_free_coherent(vpu->dev, ctx->vp8_dec.segment_map.size, > - ctx->vp8_dec.segment_map.cpu, > - ctx->vp8_dec.segment_map.dma); > - > - return ret; > +error: > + hantro_free_aux_buf(ctx, &ctx->vp8_dec.segment_map); > + hantro_free_aux_buf(ctx, &ctx->vp8_dec.prob_tbl); > + return -ENOMEM; > } > > void hantro_vp8_dec_exit(struct hantro_ctx *ctx) > { > - struct hantro_vp8_dec_hw_ctx *vp8_dec = &ctx->vp8_dec; > - struct hantro_dev *vpu = ctx->dev; > - > - dma_free_coherent(vpu->dev, vp8_dec->segment_map.size, > - vp8_dec->segment_map.cpu, vp8_dec->segment_map.dma); > - dma_free_coherent(vpu->dev, vp8_dec->prob_tbl.size, > - vp8_dec->prob_tbl.cpu, vp8_dec->prob_tbl.dma); > + hantro_free_aux_buf(ctx, &ctx->vp8_dec.segment_map); > + hantro_free_aux_buf(ctx, &ctx->vp8_dec.prob_tbl); > }