[media] dt3155v4l: drop CONFIG_DT3155_STREAMING

No need to do this as a config option. Just support both MMAP and read()
methods like any other driver.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/staging/media/dt3155v4l/Kconfig b/drivers/staging/media/dt3155v4l/Kconfig
index 2d496001b6e84d5d04e44b64274d4431f2c56ff2..fcba8667a437c907a3591def81b740df298c62f6 100644 (file)
--- a/drivers/staging/media/dt3155v4l/Kconfig
+++ b/drivers/staging/media/dt3155v4l/Kconfig
@@ -19,11 +19,3 @@ config DT3155_CCIR
        ---help---
          Select it for CCIR/50Hz (European region),
          or leave it unselected for RS-170/60Hz (North America).
-
-config DT3155_STREAMING
-       bool "Selects streaming capture method"
-       depends on VIDEO_DT3155
-       default y
-       ---help---
-         Select it if you want to use streaming of memory mapped buffers
-         or leave it unselected if you want to use read method (one copy more).

diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index 6d571f6beb77bb8add2938abca5de2acdec23e9c..0162c6271e33ea928fe870e39a84cded67535428 100644 (file)
--- a/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -29,12 +29,6 @@
 
 #define DT3155_DEVICE_ID 0x1223
 
-#ifdef CONFIG_DT3155_STREAMING
-#define DT3155_CAPTURE_METHOD V4L2_CAP_STREAMING
-#else
-#define DT3155_CAPTURE_METHOD V4L2_CAP_READWRITE
-#endif
-
 /*  global initializers (for all boards)  */
 #ifdef CONFIG_DT3155_CCIR
 static const u8 csr2_init = VT_50HZ;
@@ -346,7 +340,7 @@ static int dt3155_querycap(struct file *filp, void *p, struct v4l2_capability *c
        strcpy(cap->card, DT3155_NAME " frame grabber");
        sprintf(cap->bus_info, "PCI:%s", pci_name(pd->pdev));
        cap->device_caps = V4L2_CAP_VIDEO_CAPTURE |
-                               DT3155_CAPTURE_METHOD;
+               V4L2_CAP_STREAMING | V4L2_CAP_READWRITE;
        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
        return 0;
 }