Commit 37166b2f authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab

media: ti-vpe: cal: Make cal_formats array const

The static cal_formats array contains const data, make it const. This
requires turning a few cal_fmt pointers into const pointers.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarBenoit Parrot <bparrot@ti.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 50797fb3
...@@ -89,7 +89,7 @@ struct cal_fmt { ...@@ -89,7 +89,7 @@ struct cal_fmt {
u8 bpp; u8 bpp;
}; };
static struct cal_fmt cal_formats[] = { static const struct cal_fmt cal_formats[] = {
{ {
.fourcc = V4L2_PIX_FMT_YUYV, .fourcc = V4L2_PIX_FMT_YUYV,
.code = MEDIA_BUS_FMT_YUYV8_2X8, .code = MEDIA_BUS_FMT_YUYV8_2X8,
...@@ -392,7 +392,7 @@ struct cal_ctx { ...@@ -392,7 +392,7 @@ struct cal_ctx {
struct v4l2_mbus_framefmt m_fmt; struct v4l2_mbus_framefmt m_fmt;
/* Current subdev enumerated format */ /* Current subdev enumerated format */
struct cal_fmt *active_fmt[ARRAY_SIZE(cal_formats)]; const struct cal_fmt *active_fmt[ARRAY_SIZE(cal_formats)];
int num_active_fmt; int num_active_fmt;
struct v4l2_fract timeperframe; struct v4l2_fract timeperframe;
...@@ -1932,7 +1932,6 @@ static int cal_async_bound(struct v4l2_async_notifier *notifier, ...@@ -1932,7 +1932,6 @@ static int cal_async_bound(struct v4l2_async_notifier *notifier,
/* Enumerate sub device formats and enable all matching local formats */ /* Enumerate sub device formats and enable all matching local formats */
ctx->num_active_fmt = 0; ctx->num_active_fmt = 0;
for (j = 0, i = 0; ret != -EINVAL; ++j) { for (j = 0, i = 0; ret != -EINVAL; ++j) {
struct cal_fmt *fmt;
memset(&mbus_code, 0, sizeof(mbus_code)); memset(&mbus_code, 0, sizeof(mbus_code));
mbus_code.index = j; mbus_code.index = j;
...@@ -1947,7 +1946,7 @@ static int cal_async_bound(struct v4l2_async_notifier *notifier, ...@@ -1947,7 +1946,7 @@ static int cal_async_bound(struct v4l2_async_notifier *notifier,
subdev->name, mbus_code.code, j); subdev->name, mbus_code.code, j);
for (k = 0; k < ARRAY_SIZE(cal_formats); k++) { for (k = 0; k < ARRAY_SIZE(cal_formats); k++) {
fmt = &cal_formats[k]; const struct cal_fmt *fmt = &cal_formats[k];
if (mbus_code.code == fmt->code) { if (mbus_code.code == fmt->code) {
ctx->active_fmt[i] = fmt; ctx->active_fmt[i] = fmt;
......
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