On 10/12/2024 10:28, Ricardo Ribalda wrote: > Most of the drivers use the control framework or can use the superset > version of these callbacks: vidioc_g/s_ext_ctrl and > vidioc_query_ext_ctrl. > > Signed-off-by: Ricardo Ribalda <ribalda@xxxxxxxxxxxx> > --- > Changes in v2: > - v4l2_query_ext_ctrl_to_v4l2_queryctrl > - Fix conversion (Thanks Hans) > - Link to v1: https://lore.kernel.org/r/20241209-queryctrl-v1-0-deff7acfcdcb@xxxxxxxxxxxx > > --- > Ricardo Ribalda (11): > media: ioctl: Simulate v4l2_queryctrl with v4l2_query_ext_ctrl > media: pvrusb2: Convert queryctrl to query_ext_ctrl > media: pvrusb2: Remove g/s_ctrl callbacks > media: uvcvideo: Remove vidioc_queryctrl > media: atomisp: Replace queryctrl with query_ext_ctrl > media: atomisp: Remove vidioc_g/s callback > media: v4l2: Remove vidioc_queryctrl callback > media: v4l2: Remove vidioc_g_ctrl callback > media: cx231xx: Replace s_ctrl with s_ext_ctrls > media: v4l2: Remove vidioc_s_ctrl callback > media: v4l2-core: Introduce v4l2_query_ext_ctrl_to_v4l2_queryctrl > > drivers/media/usb/cx231xx/cx231xx-417.c | 21 ++++++---- > drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 40 ++++-------------- > drivers/media/usb/uvc/uvc_v4l2.c | 10 ----- > drivers/media/v4l2-core/v4l2-ctrls-api.c | 51 +++++++++++++---------- > drivers/media/v4l2-core/v4l2-dev.c | 6 +-- > drivers/media/v4l2-core/v4l2-ioctl.c | 19 +++++---- > drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 35 ++++++++-------- > include/media/v4l2-ctrls.h | 12 ++++++ > include/media/v4l2-ioctl.h | 12 ------ > 9 files changed, 97 insertions(+), 109 deletions(-) > --- > base-commit: 6c10d1adae82e1c8da16e7ebd2320e69f20b9d6f > change-id: 20241209-queryctrl-5c3632b7c857 > > Best regards, $ git grep vidioc_s_ctrl drivers/media/radio/radio-wl1273.c:static int wl1273_fm_vidioc_s_ctrl(struct v4l2_ctrl *ctrl) drivers/media/radio/radio-wl1273.c: .s_ctrl = wl1273_fm_vidioc_s_ctrl, Now that s_ctrl is the callback of the control handler ops, but I think it is wise if you add a patch that renames wl1273_fm_vidioc_s_ctrl to wl1273_fm_s_ctrl. Just so the string 'vidioc_s_ctrl' no longer exists in the code base. Besides, it isn't the correct name of this function anyway. It's clearly a left-over from the past. Regards, Hans
