[PATCH 09/10] media: hantro: Don't require unneeded H264_SLICE_PARAMS

[Ezequiel Garcia]

Now that slice invariant parameters have been moved,
the driver no longer needs this control, so drop it.

Signed-off-by: Ezequiel Garcia <ezequ...@collabora.com>
---
 drivers/staging/media/hantro/hantro_drv.c  | 5 -----
 drivers/staging/media/hantro/hantro_h264.c | 5 -----
 drivers/staging/media/hantro/hantro_hw.h   | 2 --
 3 files changed, 12 deletions(-)

diff --git a/drivers/staging/media/hantro/hantro_drv.c 
b/drivers/staging/media/hantro/hantro_drv.c
index 34797507f214..3cd00cc0a364 100644
--- a/drivers/staging/media/hantro/hantro_drv.c
+++ b/drivers/staging/media/hantro/hantro_drv.c
@@ -306,11 +306,6 @@ static const struct hantro_ctrl controls[] = {
                .cfg = {
                        .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS,
                },
-       }, {
-               .codec = HANTRO_H264_DECODER,
-               .cfg = {
-                       .id = V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS,
-               },
        }, {
                .codec = HANTRO_H264_DECODER,
                .cfg = {
diff --git a/drivers/staging/media/hantro/hantro_h264.c 
b/drivers/staging/media/hantro/hantro_h264.c
index 0cbe514dc79a..6887318ed4d8 100644
--- a/drivers/staging/media/hantro/hantro_h264.c
+++ b/drivers/staging/media/hantro/hantro_h264.c
@@ -349,11 +349,6 @@ int hantro_h264_dec_prepare_run(struct hantro_ctx *ctx)
        if (WARN_ON(!ctrls->decode))
                return -EINVAL;
 
-       ctrls->slices =
-               hantro_get_ctrl(ctx, V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS);
-       if (WARN_ON(!ctrls->slices))
-               return -EINVAL;
-
        ctrls->sps =
                hantro_get_ctrl(ctx, V4L2_CID_MPEG_VIDEO_H264_SPS);
        if (WARN_ON(!ctrls->sps))
diff --git a/drivers/staging/media/hantro/hantro_hw.h 
b/drivers/staging/media/hantro/hantro_hw.h
index f066de6b592d..219283a06f52 100644
--- a/drivers/staging/media/hantro/hantro_hw.h
+++ b/drivers/staging/media/hantro/hantro_hw.h
@@ -56,14 +56,12 @@ struct hantro_jpeg_enc_hw_ctx {
  * struct hantro_h264_dec_ctrls
  * @decode:    Decode params
  * @scaling:   Scaling info
- * @slice:     Slice params
  * @sps:       SPS info
  * @pps:       PPS info
  */
 struct hantro_h264_dec_ctrls {
        const struct v4l2_ctrl_h264_decode_params *decode;
        const struct v4l2_ctrl_h264_scaling_matrix *scaling;
-       const struct v4l2_ctrl_h264_slice_params *slices;
        const struct v4l2_ctrl_h264_sps *sps;
        const struct v4l2_ctrl_h264_pps *pps;
 };
-- 
2.27.0