Commit 814c3762 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab

[media] coda: mark constant structures as such

The format and codec lists and the ops structures are read-only.
Mark them as const.
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 4f31ff01
...@@ -102,7 +102,7 @@ struct coda_codec { ...@@ -102,7 +102,7 @@ struct coda_codec {
struct coda_devtype { struct coda_devtype {
char *firmware; char *firmware;
enum coda_product product; enum coda_product product;
struct coda_codec *codecs; const struct coda_codec *codecs;
unsigned int num_codecs; unsigned int num_codecs;
size_t workbuf_size; size_t workbuf_size;
size_t tempbuf_size; size_t tempbuf_size;
...@@ -225,7 +225,7 @@ struct coda_ctx { ...@@ -225,7 +225,7 @@ struct coda_ctx {
u32 sequence_offset; u32 sequence_offset;
struct coda_q_data q_data[2]; struct coda_q_data q_data[2];
enum coda_inst_type inst_type; enum coda_inst_type inst_type;
struct coda_codec *codec; const struct coda_codec *codec;
enum v4l2_colorspace colorspace; enum v4l2_colorspace colorspace;
struct coda_params params; struct coda_params params;
struct v4l2_ctrl_handler ctrls; struct v4l2_ctrl_handler ctrls;
...@@ -390,7 +390,7 @@ static struct coda_q_data *get_q_data(struct coda_ctx *ctx, ...@@ -390,7 +390,7 @@ static struct coda_q_data *get_q_data(struct coda_ctx *ctx,
/* /*
* Array of all formats supported by any version of Coda: * Array of all formats supported by any version of Coda:
*/ */
static struct coda_fmt coda_formats[] = { static const struct coda_fmt coda_formats[] = {
{ {
.name = "YUV 4:2:0 Planar, YCbCr", .name = "YUV 4:2:0 Planar, YCbCr",
.fourcc = V4L2_PIX_FMT_YUV420, .fourcc = V4L2_PIX_FMT_YUV420,
...@@ -419,19 +419,19 @@ static struct coda_fmt coda_formats[] = { ...@@ -419,19 +419,19 @@ static struct coda_fmt coda_formats[] = {
* i.MX6 -> coda960 * i.MX6 -> coda960
* Use V4L2_PIX_FMT_YUV420 as placeholder for all supported YUV 4:2:0 variants * Use V4L2_PIX_FMT_YUV420 as placeholder for all supported YUV 4:2:0 variants
*/ */
static struct coda_codec codadx6_codecs[] = { static const struct coda_codec codadx6_codecs[] = {
CODA_CODEC(CODADX6_MODE_ENCODE_H264, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_H264, 720, 576), CODA_CODEC(CODADX6_MODE_ENCODE_H264, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_H264, 720, 576),
CODA_CODEC(CODADX6_MODE_ENCODE_MP4, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4, 720, 576), CODA_CODEC(CODADX6_MODE_ENCODE_MP4, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4, 720, 576),
}; };
static struct coda_codec coda7_codecs[] = { static const struct coda_codec coda7_codecs[] = {
CODA_CODEC(CODA7_MODE_ENCODE_H264, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_H264, 1280, 720), CODA_CODEC(CODA7_MODE_ENCODE_H264, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_H264, 1280, 720),
CODA_CODEC(CODA7_MODE_ENCODE_MP4, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4, 1280, 720), CODA_CODEC(CODA7_MODE_ENCODE_MP4, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4, 1280, 720),
CODA_CODEC(CODA7_MODE_DECODE_H264, V4L2_PIX_FMT_H264, V4L2_PIX_FMT_YUV420, 1920, 1080), CODA_CODEC(CODA7_MODE_DECODE_H264, V4L2_PIX_FMT_H264, V4L2_PIX_FMT_YUV420, 1920, 1080),
CODA_CODEC(CODA7_MODE_DECODE_MP4, V4L2_PIX_FMT_MPEG4, V4L2_PIX_FMT_YUV420, 1920, 1080), CODA_CODEC(CODA7_MODE_DECODE_MP4, V4L2_PIX_FMT_MPEG4, V4L2_PIX_FMT_YUV420, 1920, 1080),
}; };
static struct coda_codec coda9_codecs[] = { static const struct coda_codec coda9_codecs[] = {
CODA_CODEC(CODA9_MODE_ENCODE_H264, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_H264, 1920, 1080), CODA_CODEC(CODA9_MODE_ENCODE_H264, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_H264, 1920, 1080),
CODA_CODEC(CODA9_MODE_ENCODE_MP4, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4, 1920, 1080), CODA_CODEC(CODA9_MODE_ENCODE_MP4, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4, 1920, 1080),
CODA_CODEC(CODA9_MODE_DECODE_H264, V4L2_PIX_FMT_H264, V4L2_PIX_FMT_YUV420, 1920, 1080), CODA_CODEC(CODA9_MODE_DECODE_H264, V4L2_PIX_FMT_H264, V4L2_PIX_FMT_YUV420, 1920, 1080),
...@@ -458,10 +458,10 @@ static u32 coda_format_normalize_yuv(u32 fourcc) ...@@ -458,10 +458,10 @@ static u32 coda_format_normalize_yuv(u32 fourcc)
return coda_format_is_yuv(fourcc) ? V4L2_PIX_FMT_YUV420 : fourcc; return coda_format_is_yuv(fourcc) ? V4L2_PIX_FMT_YUV420 : fourcc;
} }
static struct coda_codec *coda_find_codec(struct coda_dev *dev, int src_fourcc, static const struct coda_codec *coda_find_codec(struct coda_dev *dev,
int dst_fourcc) int src_fourcc, int dst_fourcc)
{ {
struct coda_codec *codecs = dev->devtype->codecs; const struct coda_codec *codecs = dev->devtype->codecs;
int num_codecs = dev->devtype->num_codecs; int num_codecs = dev->devtype->num_codecs;
int k; int k;
...@@ -483,10 +483,10 @@ static struct coda_codec *coda_find_codec(struct coda_dev *dev, int src_fourcc, ...@@ -483,10 +483,10 @@ static struct coda_codec *coda_find_codec(struct coda_dev *dev, int src_fourcc,
} }
static void coda_get_max_dimensions(struct coda_dev *dev, static void coda_get_max_dimensions(struct coda_dev *dev,
struct coda_codec *codec, const struct coda_codec *codec,
int *max_w, int *max_h) int *max_w, int *max_h)
{ {
struct coda_codec *codecs = dev->devtype->codecs; const struct coda_codec *codecs = dev->devtype->codecs;
int num_codecs = dev->devtype->num_codecs; int num_codecs = dev->devtype->num_codecs;
unsigned int w, h; unsigned int w, h;
int k; int k;
...@@ -546,9 +546,9 @@ static int coda_enum_fmt(struct file *file, void *priv, ...@@ -546,9 +546,9 @@ static int coda_enum_fmt(struct file *file, void *priv,
struct v4l2_fmtdesc *f) struct v4l2_fmtdesc *f)
{ {
struct coda_ctx *ctx = fh_to_ctx(priv); struct coda_ctx *ctx = fh_to_ctx(priv);
struct coda_codec *codecs = ctx->dev->devtype->codecs; const struct coda_codec *codecs = ctx->dev->devtype->codecs;
struct coda_fmt *formats = coda_formats; const struct coda_fmt *formats = coda_formats;
struct coda_fmt *fmt; const struct coda_fmt *fmt;
int num_codecs = ctx->dev->devtype->num_codecs; int num_codecs = ctx->dev->devtype->num_codecs;
int num_formats = ARRAY_SIZE(coda_formats); int num_formats = ARRAY_SIZE(coda_formats);
int i, k, num = 0; int i, k, num = 0;
...@@ -621,7 +621,7 @@ static int coda_g_fmt(struct file *file, void *priv, ...@@ -621,7 +621,7 @@ static int coda_g_fmt(struct file *file, void *priv,
return 0; return 0;
} }
static int coda_try_fmt(struct coda_ctx *ctx, struct coda_codec *codec, static int coda_try_fmt(struct coda_ctx *ctx, const struct coda_codec *codec,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct coda_dev *dev = ctx->dev; struct coda_dev *dev = ctx->dev;
...@@ -683,7 +683,7 @@ static int coda_try_fmt_vid_cap(struct file *file, void *priv, ...@@ -683,7 +683,7 @@ static int coda_try_fmt_vid_cap(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct coda_ctx *ctx = fh_to_ctx(priv); struct coda_ctx *ctx = fh_to_ctx(priv);
struct coda_codec *codec = NULL; const struct coda_codec *codec = NULL;
struct vb2_queue *src_vq; struct vb2_queue *src_vq;
int ret; int ret;
...@@ -731,7 +731,7 @@ static int coda_try_fmt_vid_out(struct file *file, void *priv, ...@@ -731,7 +731,7 @@ static int coda_try_fmt_vid_out(struct file *file, void *priv,
struct v4l2_format *f) struct v4l2_format *f)
{ {
struct coda_ctx *ctx = fh_to_ctx(priv); struct coda_ctx *ctx = fh_to_ctx(priv);
struct coda_codec *codec; const struct coda_codec *codec;
/* Determine codec by encoded format, returns NULL if raw or invalid */ /* Determine codec by encoded format, returns NULL if raw or invalid */
codec = coda_find_codec(ctx->dev, f->fmt.pix.pixelformat, codec = coda_find_codec(ctx->dev, f->fmt.pix.pixelformat,
...@@ -1529,7 +1529,7 @@ static void coda_unlock(void *m2m_priv) ...@@ -1529,7 +1529,7 @@ static void coda_unlock(void *m2m_priv)
mutex_unlock(&pcdev->dev_mutex); mutex_unlock(&pcdev->dev_mutex);
} }
static struct v4l2_m2m_ops coda_m2m_ops = { static const struct v4l2_m2m_ops coda_m2m_ops = {
.device_run = coda_device_run, .device_run = coda_device_run,
.job_ready = coda_job_ready, .job_ready = coda_job_ready,
.job_abort = coda_job_abort, .job_abort = coda_job_abort,
...@@ -2799,7 +2799,7 @@ static int coda_s_ctrl(struct v4l2_ctrl *ctrl) ...@@ -2799,7 +2799,7 @@ static int coda_s_ctrl(struct v4l2_ctrl *ctrl)
return 0; return 0;
} }
static struct v4l2_ctrl_ops coda_ctrl_ops = { static const struct v4l2_ctrl_ops coda_ctrl_ops = {
.s_ctrl = coda_s_ctrl, .s_ctrl = coda_s_ctrl,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment