media: coda/venus/s5p_mfc: fix control typo

These two slice modes used by the V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE
control had a silly typo:

V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB
V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES

SICE should be SLICE.

Rename these enum values, keeping the old ones (under #ifndef __KERNEL__)
for backwards compatibility reasons.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index d774a5aaa422c1d98134e224e5a79005149850bb..a25f3742ecde7e65b1a269c2a711656b699415bd 100644 (file)
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -1043,7 +1043,7 @@ static int coda_start_encoding(struct coda_ctx *ctx)
                case V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE:
                        value = 0;
                        break;
-               case V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB:
+               case V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB:
                        value  = (ctx->params.slice_max_mb &
                                  CODA_SLICING_SIZE_MASK)
                                 << CODA_SLICING_SIZE_OFFSET;
@@ -1051,7 +1051,7 @@ static int coda_start_encoding(struct coda_ctx *ctx)
                                 << CODA_SLICING_UNIT_OFFSET;
                        value |=  1 & CODA_SLICING_MODE_MASK;
                        break;
-               case V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES:
+               case V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES:
                        value  = (ctx->params.slice_max_bits &
                                  CODA_SLICING_SIZE_MASK)
                                 << CODA_SLICING_SIZE_OFFSET;

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 1856b782fdde6e7d3b6e464206a00c30f0184180..614943e8a7a219707f47c8cf3df38eda90bcac90 100644 (file)
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -2061,7 +2061,7 @@ static void coda_encode_ctrls(struct coda_ctx *ctx)
        }
        v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,
                V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE,
-               V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES, 0x0,
+               V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES, 0x0,
                V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE);
        v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
                V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB, 1, 0x3fffffff, 1, 1);

diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c
index bd4538accf13b86dbb072760ee4e77e99a7dcd2c..7b7186ef6dd287f67cdda17caa913381f8c787ef 100644 (file)
--- a/drivers/media/platform/qcom/venus/venc_ctrls.c
+++ b/drivers/media/platform/qcom/venus/venc_ctrls.c
@@ -293,7 +293,7 @@ int venc_ctrl_init(struct venus_inst *inst)
 
        v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,
                V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE,
-               V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES,
+               V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES,
                0, V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE);
 
        v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index 8fcf627dedfbdbeddae804a52634bb16bccfe591..5505e4fc20907ddd961decb2e6e9047048faedf8 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -134,7 +134,7 @@ static struct mfc_control controls[] = {
                .id = V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE,
                .type = V4L2_CTRL_TYPE_MENU,
                .minimum = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE,
-               .maximum = V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES,
+               .maximum = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES,
                .default_value = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE,
                .menu_skip_mask = 0,
        },

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
index 6144e95f64256da99d2e51d0a2018f90bb43631b..e83ede3efca70b9d79cc205afc9f9f2e3fbfd1ba 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
@@ -695,9 +695,9 @@ static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx)
        /* multi-slice control */
        /* multi-slice MB number or bit size */
        mfc_write(dev, p->slice_mode, S5P_FIMV_ENC_MSLICE_CTRL);
-       if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {
+       if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) {
                mfc_write(dev, p->slice_mb, S5P_FIMV_ENC_MSLICE_MB);
-       } else if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
+       } else if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES) {
                mfc_write(dev, p->slice_bit, S5P_FIMV_ENC_MSLICE_BIT);
        } else {
                mfc_write(dev, 0, S5P_FIMV_ENC_MSLICE_MB);

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
index 281699ab7fe117ef3c9d70c8decf1671d3446d1f..d75511190e475745af328a8ab081038c2c234521 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
@@ -736,10 +736,10 @@ static int s5p_mfc_set_slice_mode(struct s5p_mfc_ctx *ctx)
        /* multi-slice control */
        /* multi-slice MB number or bit size */
        writel(ctx->slice_mode, mfc_regs->e_mslice_mode);
-       if (ctx->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {
+       if (ctx->slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) {
                writel(ctx->slice_size.mb, mfc_regs->e_mslice_size_mb);
        } else if (ctx->slice_mode ==
-                       V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
+                       V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES) {
                writel(ctx->slice_size.bits, mfc_regs->e_mslice_size_bits);
        } else {
                writel(0x0, mfc_regs->e_mslice_size_mb);
@@ -779,11 +779,11 @@ static int s5p_mfc_set_enc_params(struct s5p_mfc_ctx *ctx)
        /* multi-slice MB number or bit size */
        ctx->slice_mode = p->slice_mode;
        reg = 0;
-       if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB) {
+       if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) {
                reg |= (0x1 << 3);
                writel(reg, mfc_regs->e_enc_options);
                ctx->slice_size.mb = p->slice_mb;
-       } else if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES) {
+       } else if (p->slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES) {
                reg |= (0x1 << 3);
                writel(reg, mfc_regs->e_enc_options);
                ctx->slice_size.bits = p->slice_bit;

diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 37807f23231edea64b2eca99591b3af2edc51822..9cad9fd969e3fc1cb7fdc949644870338c283e70 100644 (file)
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -392,8 +392,13 @@ enum v4l2_mpeg_video_header_mode {
 #define V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE           (V4L2_CID_MPEG_BASE+221)
 enum v4l2_mpeg_video_multi_slice_mode {
        V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE         = 0,
+       V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB         = 1,
+       V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES      = 2,
+#ifndef __KERNEL__
+       /* Kept for backwards compatibility reasons. Stupid typo... */
        V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB          = 1,
        V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES       = 2,
+#endif
 };
 #define V4L2_CID_MPEG_VIDEO_VBV_SIZE                   (V4L2_CID_MPEG_BASE+222)
 #define V4L2_CID_MPEG_VIDEO_DEC_PTS                    (V4L2_CID_MPEG_BASE+223)