diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-12-07 02:03:50 +0100 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-12-07 02:03:50 +0100 |
| commit | 0c92218f4e7d4b4a7245d32bea042fa6f9cc39d7 (patch) | |
| tree | 44d6ba1879278a5a1b58178e9b0f799427e52e0e /drivers/media/platform/renesas/vsp1/vsp1_rwpf.c | |
| parent | mm/madvise: add cond_resched() in madvise_cold_or_pageout_pte_range() (diff) | |
| parent | Linux 6.7-rc4 (diff) | |
| download | linux-0c92218f4e7d4b4a7245d32bea042fa6f9cc39d7.tar.xz linux-0c92218f4e7d4b4a7245d32bea042fa6f9cc39d7.zip | |
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'drivers/media/platform/renesas/vsp1/vsp1_rwpf.c')
| -rw-r--r-- | drivers/media/platform/renesas/vsp1/vsp1_rwpf.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/platform/renesas/vsp1/vsp1_rwpf.c b/drivers/media/platform/renesas/vsp1/vsp1_rwpf.c index 22a82d218152..e0f87c8103ca 100644 --- a/drivers/media/platform/renesas/vsp1/vsp1_rwpf.c +++ b/drivers/media/platform/renesas/vsp1/vsp1_rwpf.c @@ -24,7 +24,7 @@ struct v4l2_rect *vsp1_rwpf_get_crop(struct vsp1_rwpf *rwpf, } /* ----------------------------------------------------------------------------- - * V4L2 Subdevice Pad Operations + * V4L2 Subdevice Operations */ static int vsp1_rwpf_enum_mbus_code(struct v4l2_subdev *subdev, @@ -243,7 +243,7 @@ done: return ret; } -const struct v4l2_subdev_pad_ops vsp1_rwpf_pad_ops = { +static const struct v4l2_subdev_pad_ops vsp1_rwpf_pad_ops = { .init_cfg = vsp1_entity_init_cfg, .enum_mbus_code = vsp1_rwpf_enum_mbus_code, .enum_frame_size = vsp1_rwpf_enum_frame_size, @@ -253,6 +253,10 @@ const struct v4l2_subdev_pad_ops vsp1_rwpf_pad_ops = { .set_selection = vsp1_rwpf_set_selection, }; +const struct v4l2_subdev_ops vsp1_rwpf_subdev_ops = { + .pad = &vsp1_rwpf_pad_ops, +}; + /* ----------------------------------------------------------------------------- * Controls */ |