media: cedrus: Remove cedrus_codec enum

Last user of cedrus_codec enum is cedrus_engine_enable() but this
argument is completely redundant. Same information can be obtained via
source pixel format. Let's remove this argument and enum.

No functional changes intended.

Acked-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h
index bcb7f31..a6a649b 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus.h
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.h
@@ -35,14 +35,6 @@
 #define CEDRUS_CAPABILITY_VP8_DEC      BIT(4)
 #define CEDRUS_CAPABILITY_H265_10_DEC  BIT(5)
 
-enum cedrus_codec {
-       CEDRUS_CODEC_MPEG2,
-       CEDRUS_CODEC_H264,
-       CEDRUS_CODEC_H265,
-       CEDRUS_CODEC_VP8,
-       CEDRUS_CODEC_LAST,
-};
-
 enum cedrus_irq_status {
        CEDRUS_IRQ_NONE,
        CEDRUS_IRQ_ERROR,

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
index a8b236c..c139a37 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
@@ -497,7 +497,7 @@ static int cedrus_h264_setup(struct cedrus_ctx *ctx, struct cedrus_run *run)
 {
        struct cedrus_dev *dev = ctx->dev;
 
-       cedrus_engine_enable(ctx, CEDRUS_CODEC_H264);
+       cedrus_engine_enable(ctx);
 
        cedrus_write(dev, VE_H264_SDROT_CTRL, 0);
        cedrus_write(dev, VE_H264_EXTRA_BUFFER1,

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
index 4952fc1..3f2946c 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
@@ -463,7 +463,7 @@ static int cedrus_h265_setup(struct cedrus_ctx *ctx, struct cedrus_run *run)
        }
 
        /* Activate H265 engine. */
-       cedrus_engine_enable(ctx, CEDRUS_CODEC_H265);
+       cedrus_engine_enable(ctx);
 
        /* Source offset and length in bits. */
 

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
index c3387cd..fa86a65 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
@@ -31,7 +31,7 @@
 #include "cedrus_hw.h"
 #include "cedrus_regs.h"
 
-int cedrus_engine_enable(struct cedrus_ctx *ctx, enum cedrus_codec codec)
+int cedrus_engine_enable(struct cedrus_ctx *ctx)
 {
        u32 reg = 0;
 
@@ -42,18 +42,18 @@ int cedrus_engine_enable(struct cedrus_ctx *ctx, enum cedrus_codec codec)
        reg |= VE_MODE_REC_WR_MODE_2MB;
        reg |= VE_MODE_DDR_MODE_BW_128;
 
-       switch (codec) {
-       case CEDRUS_CODEC_MPEG2:
+       switch (ctx->src_fmt.pixelformat) {
+       case V4L2_PIX_FMT_MPEG2_SLICE:
                reg |= VE_MODE_DEC_MPEG;
                break;
 
        /* H.264 and VP8 both use the same decoding mode bit. */
-       case CEDRUS_CODEC_H264:
-       case CEDRUS_CODEC_VP8:
+       case V4L2_PIX_FMT_H264_SLICE:
+       case V4L2_PIX_FMT_VP8_FRAME:
                reg |= VE_MODE_DEC_H264;
                break;
 
-       case CEDRUS_CODEC_H265:
+       case V4L2_PIX_FMT_HEVC_SLICE:
                reg |= VE_MODE_DEC_H265;
                break;
 

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.h b/drivers/staging/media/sunxi/cedrus/cedrus_hw.h
index 7c92f00..6f1e701 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.h
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.h
@@ -16,7 +16,7 @@
 #ifndef _CEDRUS_HW_H_
 #define _CEDRUS_HW_H_
 
-int cedrus_engine_enable(struct cedrus_ctx *ctx, enum cedrus_codec codec);
+int cedrus_engine_enable(struct cedrus_ctx *ctx);
 void cedrus_engine_disable(struct cedrus_dev *dev);
 
 void cedrus_dst_format_set(struct cedrus_dev *dev,

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c b/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c
index c1128d2..10e98f0 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c
@@ -66,7 +66,7 @@ static int cedrus_mpeg2_setup(struct cedrus_ctx *ctx, struct cedrus_run *run)
        quantisation = run->mpeg2.quantisation;
 
        /* Activate MPEG engine. */
-       cedrus_engine_enable(ctx, CEDRUS_CODEC_MPEG2);
+       cedrus_engine_enable(ctx);
 
        /* Set intra quantisation matrix. */
        matrix = quantisation->intra_quantiser_matrix;

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_vp8.c b/drivers/staging/media/sunxi/cedrus/cedrus_vp8.c
index f7714ba..969677a 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus_vp8.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_vp8.c
@@ -662,7 +662,7 @@ static int cedrus_vp8_setup(struct cedrus_ctx *ctx, struct cedrus_run *run)
        int header_size;
        u32 reg;
 
-       cedrus_engine_enable(ctx, CEDRUS_CODEC_VP8);
+       cedrus_engine_enable(ctx);
 
        cedrus_write(dev, VE_H264_CTRL, VE_H264_CTRL_VP8);