media: hackrf: group device capabilities
authorGustavo Padovan <gustavo.padovan@collabora.com>
Fri, 4 May 2018 20:05:59 +0000 (16:05 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Fri, 11 May 2018 15:25:23 +0000 (11:25 -0400)
Instead of putting V4L2_CAP_STREAMING and V4L2_CAP_READWRITE
everywhere, set device_caps earlier with these values.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/usb/hackrf/hackrf.c

index 7eb5351..6d692fb 100644 (file)
@@ -909,18 +909,15 @@ static int hackrf_querycap(struct file *file, void *fh,
 
        dev_dbg(&intf->dev, "\n");
 
+       cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
        if (vdev->vfl_dir == VFL_DIR_RX)
-               cap->device_caps = V4L2_CAP_SDR_CAPTURE | V4L2_CAP_TUNER |
-                                  V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
-
+               cap->device_caps |= V4L2_CAP_SDR_CAPTURE | V4L2_CAP_TUNER;
        else
-               cap->device_caps = V4L2_CAP_SDR_OUTPUT | V4L2_CAP_MODULATOR |
-                                  V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
+               cap->device_caps |= V4L2_CAP_SDR_OUTPUT | V4L2_CAP_MODULATOR;
 
        cap->capabilities = V4L2_CAP_SDR_CAPTURE | V4L2_CAP_TUNER |
                            V4L2_CAP_SDR_OUTPUT | V4L2_CAP_MODULATOR |
-                           V4L2_CAP_STREAMING | V4L2_CAP_READWRITE |
-                           V4L2_CAP_DEVICE_CAPS;
+                           V4L2_CAP_DEVICE_CAPS | cap->device_caps;
        strlcpy(cap->driver, KBUILD_MODNAME, sizeof(cap->driver));
        strlcpy(cap->card, dev->rx_vdev.name, sizeof(cap->card));
        usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));