diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2015-04-25 11:54:49 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-05-01 08:22:09 -0300 |
| commit | a6e951441406c3e9bc949251d6b1d70205eb6992 (patch) | |
| tree | 2d97b78ef6cc09f9adef2b1f61290ad6bd940279 | |
| parent | 9556be12177e98bc7a566a80246e083d9892f863 (diff) | |
| download | op-kernel-dev-a6e951441406c3e9bc949251d6b1d70205eb6992.zip op-kernel-dev-a6e951441406c3e9bc949251d6b1d70205eb6992.tar.gz | |
[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>
| -rw-r--r-- | drivers/staging/media/dt3155v4l/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/staging/media/dt3155v4l/dt3155v4l.c | 8 |
2 files changed, 1 insertions, 15 deletions
diff --git a/drivers/staging/media/dt3155v4l/Kconfig b/drivers/staging/media/dt3155v4l/Kconfig index 2d49600..fcba866 100644 --- 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 6d571f6..0162c62 100644 --- 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; } |
