mirror of
https://github.com/torvalds/linux.git
synced 2026-09-24 06:24:02 +02:00
media: mediatek: vcodec: remove redundant return value of vdec_vp9_slice_setup_prob_buffer()
vdec_vp9_slice_setup_prob_buffer() never fails, remove 'return 0' from vdec_vp9_slice_setup_prob_buffer() and modify its signature. Also, remove the return value check in vdec_vp9_slice_setup_single() and vdec_vp9_slice_setup_lat(). Signed-off-by: Haoxiang Li <lihaoxiang@isrc.iscas.ac.cn> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
parent
1e77971dbe
commit
2a577b0bd6
|
|
@ -1013,8 +1013,8 @@ static void vdec_vp9_slice_setup_lat_buffer(struct vdec_vp9_slice_instance *inst
|
|||
vsi->row_info.size = 0;
|
||||
}
|
||||
|
||||
static int vdec_vp9_slice_setup_prob_buffer(struct vdec_vp9_slice_instance *instance,
|
||||
struct vdec_vp9_slice_vsi *vsi)
|
||||
static void vdec_vp9_slice_setup_prob_buffer(struct vdec_vp9_slice_instance *instance,
|
||||
struct vdec_vp9_slice_vsi *vsi)
|
||||
{
|
||||
struct vdec_vp9_slice_frame_ctx *frame_ctx;
|
||||
struct vdec_vp9_slice_uncompressed_header *uh;
|
||||
|
|
@ -1030,8 +1030,6 @@ static int vdec_vp9_slice_setup_prob_buffer(struct vdec_vp9_slice_instance *inst
|
|||
else
|
||||
frame_ctx = vdec_vp9_slice_default_frame_ctx;
|
||||
memcpy(instance->prob.va, frame_ctx, sizeof(*frame_ctx));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void vdec_vp9_slice_setup_seg_buffer(struct vdec_vp9_slice_instance *instance,
|
||||
|
|
@ -1170,9 +1168,7 @@ static int vdec_vp9_slice_setup_lat(struct vdec_vp9_slice_instance *instance,
|
|||
|
||||
/* setup prob/tile buffers for LAT */
|
||||
|
||||
ret = vdec_vp9_slice_setup_prob_buffer(instance, vsi);
|
||||
if (ret)
|
||||
goto err;
|
||||
vdec_vp9_slice_setup_prob_buffer(instance, vsi);
|
||||
|
||||
ret = vdec_vp9_slice_setup_tile_buffer(instance, vsi, bs);
|
||||
if (ret)
|
||||
|
|
@ -1804,10 +1800,7 @@ static int vdec_vp9_slice_setup_single(struct vdec_vp9_slice_instance *instance,
|
|||
|
||||
vdec_vp9_slice_setup_single_buffer(instance, pfc, vsi, bs, fb);
|
||||
vdec_vp9_slice_setup_seg_buffer(instance, vsi, &instance->seg[0]);
|
||||
|
||||
ret = vdec_vp9_slice_setup_prob_buffer(instance, vsi);
|
||||
if (ret)
|
||||
goto err;
|
||||
vdec_vp9_slice_setup_prob_buffer(instance, vsi);
|
||||
|
||||
ret = vdec_vp9_slice_setup_tile_buffer(instance, vsi, bs);
|
||||
if (ret)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user