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: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
---
drivers/media/platform/ti-vpe/cal.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 8c068af936f0..35df94da7f2c 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -89,7 +89,7 @@ struct cal_fmt {
u8 bpp;
};
-static struct cal_fmt cal_formats[] = {
+static const struct cal_fmt cal_formats[] = {
{
.fourcc = V4L2_PIX_FMT_YUYV,
.code = MEDIA_BUS_FMT_YUYV8_2X8,
@@ -392,7 +392,7 @@ struct cal_ctx {
struct v4l2_mbus_framefmt m_fmt;
/* 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;
struct v4l2_fract timeperframe;
@@ -1927,7 +1927,6 @@ static int cal_async_bound(struct v4l2_async_notifier *notifier,
/* Enumerate sub device formats and enable all matching local formats */
ctx->num_active_fmt = 0;
for (j = 0, i = 0; ret != -EINVAL; ++j) {
- struct cal_fmt *fmt;
memset(&mbus_code, 0, sizeof(mbus_code));
mbus_code.index = j;
@@ -1942,7 +1941,7 @@ static int cal_async_bound(struct v4l2_async_notifier *notifier,
subdev->name, mbus_code.code, j);
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) {
ctx->active_fmt[i] = fmt;
--
Regards,
Laurent Pinchart
