media: v4l2-dev: simplify the SDR checks

In determine_valid_ioctls() we can use SET_VALID_IOCTL to enable
ioctls for SDR, simplifying the code.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index 1bf5439..27fb96a 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -677,24 +677,16 @@ static void determine_valid_ioctls(struct video_device *vdev)
                SET_VALID_IOCTL(ops, VIDIOC_G_SLICED_VBI_CAP, vidioc_g_sliced_vbi_cap);
        } else if (is_sdr && is_rx) {
                /* SDR receiver specific ioctls */
-               if (ops->vidioc_enum_fmt_sdr_cap)
-                       set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls);
-               if (ops->vidioc_g_fmt_sdr_cap)
-                       set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls);
-               if (ops->vidioc_s_fmt_sdr_cap)
-                       set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls);
-               if (ops->vidioc_try_fmt_sdr_cap)
-                       set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
+               SET_VALID_IOCTL(ops, VIDIOC_ENUM_FMT, vidioc_enum_fmt_sdr_cap);
+               SET_VALID_IOCTL(ops, VIDIOC_G_FMT, vidioc_g_fmt_sdr_cap);
+               SET_VALID_IOCTL(ops, VIDIOC_S_FMT, vidioc_s_fmt_sdr_cap);
+               SET_VALID_IOCTL(ops, VIDIOC_TRY_FMT, vidioc_try_fmt_sdr_cap);
        } else if (is_sdr && is_tx) {
                /* SDR transmitter specific ioctls */
-               if (ops->vidioc_enum_fmt_sdr_out)
-                       set_bit(_IOC_NR(VIDIOC_ENUM_FMT), valid_ioctls);
-               if (ops->vidioc_g_fmt_sdr_out)
-                       set_bit(_IOC_NR(VIDIOC_G_FMT), valid_ioctls);
-               if (ops->vidioc_s_fmt_sdr_out)
-                       set_bit(_IOC_NR(VIDIOC_S_FMT), valid_ioctls);
-               if (ops->vidioc_try_fmt_sdr_out)
-                       set_bit(_IOC_NR(VIDIOC_TRY_FMT), valid_ioctls);
+               SET_VALID_IOCTL(ops, VIDIOC_ENUM_FMT, vidioc_enum_fmt_sdr_out);
+               SET_VALID_IOCTL(ops, VIDIOC_G_FMT, vidioc_g_fmt_sdr_out);
+               SET_VALID_IOCTL(ops, VIDIOC_S_FMT, vidioc_s_fmt_sdr_out);
+               SET_VALID_IOCTL(ops, VIDIOC_TRY_FMT, vidioc_try_fmt_sdr_out);
        }
 
        if (is_vid || is_vbi || is_sdr || is_tch || is_meta) {