Commit 4fc81c58 authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Hans Verkuil
Browse files

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: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 4e161728

drivers/staging/media/sunxi/cedrus/cedrus.h

+0 −8
Original line number Diff line number Diff line
@@ -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,

drivers/staging/media/sunxi/cedrus/cedrus_h264.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/staging/media/sunxi/cedrus/cedrus_h265.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */

drivers/staging/media/sunxi/cedrus/cedrus_hw.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

drivers/staging/media/sunxi/cedrus/cedrus_hw.h

+1 −1
Original line number Diff line number Diff line
@@ -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,