media: rockchip: rkisp1: Constify static structs

These 'ops' structs are never modified, so make them const to allow the
compiler to put them in read-only memory.

Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com>
Reviewed-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
index b81235afd05340c3a4392d5f84580db988dd8634..380582f68acea8af4714b05e53c00c7e042b2547 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
@@ -565,7 +565,7 @@ static void rkisp1_sp_set_data_path(struct rkisp1_capture *cap)
        rkisp1_write(cap->rkisp1, dpcl, RKISP1_CIF_VI_DPCL);
 }
 
-static struct rkisp1_capture_ops rkisp1_capture_ops_mp = {
+static const struct rkisp1_capture_ops rkisp1_capture_ops_mp = {
        .config = rkisp1_mp_config,
        .enable = rkisp1_mp_enable,
        .disable = rkisp1_mp_disable,
@@ -574,7 +574,7 @@ static struct rkisp1_capture_ops rkisp1_capture_ops_mp = {
        .is_stopped = rkisp1_mp_is_stopped,
 };
 
-static struct rkisp1_capture_ops rkisp1_capture_ops_sp = {
+static const struct rkisp1_capture_ops rkisp1_capture_ops_sp = {
        .config = rkisp1_sp_config,
        .enable = rkisp1_sp_enable,
        .disable = rkisp1_sp_disable,
@@ -1038,7 +1038,7 @@ err_ret_buffers:
        return ret;
 }
 
-static struct vb2_ops rkisp1_vb2_ops = {
+static const struct vb2_ops rkisp1_vb2_ops = {
        .queue_setup = rkisp1_vb2_queue_setup,
        .buf_queue = rkisp1_vb2_buf_queue,
        .buf_prepare = rkisp1_vb2_buf_prepare,

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index 3a134e97161cbbfa965959ae3574964b3699621c..038c303a8aed0a0adf9e20d3ce352458f07632b4 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -214,7 +214,7 @@ struct rkisp1_capture {
        struct rkisp1_vdev_node vnode;
        struct rkisp1_device *rkisp1;
        enum rkisp1_stream_id id;
-       struct rkisp1_capture_ops *ops;
+       const struct rkisp1_capture_ops *ops;
        const struct rkisp1_capture_config *config;
        bool is_streaming;
        bool is_stopping;

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
index 03f9a81df44047fead49bf98336ea9c48de05c05..6af4d551ffb54714123335718ca4b46db1bb6b30 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
@@ -1469,7 +1469,7 @@ static void rkisp1_params_vb2_stop_streaming(struct vb2_queue *vq)
                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
 }
 
-static struct vb2_ops rkisp1_params_vb2_ops = {
+static const struct vb2_ops rkisp1_params_vb2_ops = {
        .queue_setup = rkisp1_params_vb2_queue_setup,
        .wait_prepare = vb2_ops_wait_prepare,
        .wait_finish = vb2_ops_wait_finish,
@@ -1479,7 +1479,7 @@ static struct vb2_ops rkisp1_params_vb2_ops = {
 
 };
 
-static struct v4l2_file_operations rkisp1_params_fops = {
+static const struct v4l2_file_operations rkisp1_params_fops = {
        .mmap = vb2_fop_mmap,
        .unlocked_ioctl = video_ioctl2,
        .poll = vb2_fop_poll,