media: drop CONFIG_MEDIA_CONTROLLER_REQUEST_API

This config option was added during the development of the Request API
to make it easy to disable it.

The Request API is now stable so it is time to drop this option altogether.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
index 440c3b1c18ec1c9adde9479a7a032059a9315242..54d572c3b515d67722c4dbe7490437bc83c30b96 100644 (file)
--- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
+++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
@@ -684,10 +684,8 @@ static void fill_buf_caps(struct vb2_queue *q, u32 *caps)
                *caps |= V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF;
        if (q->allow_cache_hints && q->io_modes & VB2_MMAP)
                *caps |= V4L2_BUF_CAP_SUPPORTS_MMAP_CACHE_HINTS;
-#ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API
        if (q->supports_requests)
                *caps |= V4L2_BUF_CAP_SUPPORTS_REQUESTS;
-#endif
 }
 
 static void validate_memory_flags(struct vb2_queue *q,

diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig
index 375b096129811962f4fccebc0a6adb2d521905da..c82b07d2ef36fa89f50c1025a5da8c0fa43bef6d 100644 (file)
--- a/drivers/media/mc/Kconfig
+++ b/drivers/media/mc/Kconfig
@@ -11,10 +11,3 @@ config MEDIA_CONTROLLER_DVB
          Enable the media controller API support for DVB.
 
          This is currently experimental.
-
-config MEDIA_CONTROLLER_REQUEST_API
-       bool
-       depends on MEDIA_CONTROLLER
-       help
-         This option enables the Request API for the Media controller and V4L2
-         interfaces. It is currently needed by a few stateless codec drivers.

diff --git a/drivers/media/mc/mc-device.c b/drivers/media/mc/mc-device.c
index 8cee956e38d42174dba763e469df6df796a40bdd..c0dd4ae5722725f1744bc6fd6282d5c765438059 100644 (file)
--- a/drivers/media/mc/mc-device.c
+++ b/drivers/media/mc/mc-device.c
@@ -372,16 +372,12 @@ static long media_device_get_topology(struct media_device *mdev, void *arg)
 
 static long media_device_request_alloc(struct media_device *mdev, void *arg)
 {
-#ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API
        int *alloc_fd = arg;
 
        if (!mdev->ops || !mdev->ops->req_validate || !mdev->ops->req_queue)
                return -ENOTTY;
 
        return media_request_alloc(mdev, alloc_fd);
-#else
-       return -ENOTTY;
-#endif
 }
 
 static long copy_arg_from_user(void *karg, void __user *uarg, unsigned int cmd)

diff --git a/drivers/media/platform/mediatek/vcodec/Kconfig b/drivers/media/platform/mediatek/vcodec/Kconfig
index 74b00eb1bc9775c0b6c9143b00eb909da303a1de..bc8292232530b3b451675f46b004b5d17bce550e 100644 (file)
--- a/drivers/media/platform/mediatek/vcodec/Kconfig
+++ b/drivers/media/platform/mediatek/vcodec/Kconfig
@@ -24,7 +24,6 @@ config VIDEO_MEDIATEK_VCODEC
        select V4L2_H264
        select V4L2_VP9
        select MEDIA_CONTROLLER
-       select MEDIA_CONTROLLER_REQUEST_API
        help
          Mediatek video codec driver provides HW capability to
          encode and decode in a range of video formats on MT8173

diff --git a/drivers/media/platform/nvidia/tegra-vde/Kconfig b/drivers/media/platform/nvidia/tegra-vde/Kconfig
index f7454823bbbbacebc13b230db34a38dad6b19e48..2fe13f39c95bbf826140a3ba156f6c22dd6f9a69 100644 (file)
--- a/drivers/media/platform/nvidia/tegra-vde/Kconfig
+++ b/drivers/media/platform/nvidia/tegra-vde/Kconfig
@@ -6,7 +6,6 @@ config VIDEO_TEGRA_VDE
        select DMA_SHARED_BUFFER
        select IOMMU_IOVA
        select MEDIA_CONTROLLER
-       select MEDIA_CONTROLLER_REQUEST_API
        select SRAM
        select VIDEOBUF2_DMA_CONTIG
        select VIDEOBUF2_DMA_SG

diff --git a/drivers/media/platform/verisilicon/Kconfig b/drivers/media/platform/verisilicon/Kconfig
index e65b836b9d7888cdcf77423974223ceda492bb45..24b927d8f182e20deab7b5a5b51f5f3fb4f04ba1 100644 (file)
--- a/drivers/media/platform/verisilicon/Kconfig
+++ b/drivers/media/platform/verisilicon/Kconfig
@@ -8,7 +8,6 @@ config VIDEO_HANTRO
        depends on V4L_MEM2MEM_DRIVERS
        depends on VIDEO_DEV
        select MEDIA_CONTROLLER
-       select MEDIA_CONTROLLER_REQUEST_API
        select VIDEOBUF2_DMA_CONTIG
        select VIDEOBUF2_VMALLOC
        select V4L2_MEM2MEM_DEV

diff --git a/drivers/media/test-drivers/Kconfig b/drivers/media/test-drivers/Kconfig
index 459b433e9faebf41c251ee0875c2a97d9f7000db..5a5379524bde279ba18b70ae140ae37fade97f68 100644 (file)
--- a/drivers/media/test-drivers/Kconfig
+++ b/drivers/media/test-drivers/Kconfig
@@ -12,7 +12,6 @@ config VIDEO_VIM2M
        select VIDEOBUF2_VMALLOC
        select V4L2_MEM2MEM_DEV
        select MEDIA_CONTROLLER
-       select MEDIA_CONTROLLER_REQUEST_API
        help
          This is a virtual test device for the memory-to-memory driver
          framework.

diff --git a/drivers/media/test-drivers/vicodec/Kconfig b/drivers/media/test-drivers/vicodec/Kconfig
index a7a828eec2a4fdc844a2f744fbebce1458c09fa9..4ea0689c3abecc54062afa42c451eb080a8aab14 100644 (file)
--- a/drivers/media/test-drivers/vicodec/Kconfig
+++ b/drivers/media/test-drivers/vicodec/Kconfig
@@ -5,7 +5,6 @@ config VIDEO_VICODEC
        select VIDEOBUF2_VMALLOC
        select V4L2_MEM2MEM_DEV
        select MEDIA_CONTROLLER
-       select MEDIA_CONTROLLER_REQUEST_API
        help
          Driver for a Virtual Codec
 

diff --git a/drivers/media/test-drivers/visl/Kconfig b/drivers/media/test-drivers/visl/Kconfig
index 7508b904f1969b2f8b4ff2a59d3dc04525d798d9..37be9f2672242588d010eaa35e70bfa4073a48fc 100644 (file)
--- a/drivers/media/test-drivers/visl/Kconfig
+++ b/drivers/media/test-drivers/visl/Kconfig
@@ -7,7 +7,6 @@ config VIDEO_VISL
        select VIDEOBUF2_VMALLOC
        select V4L2_MEM2MEM_DEV
        select MEDIA_CONTROLLER
-       select MEDIA_CONTROLLER_REQUEST_API
        select VIDEO_V4L2_TPG
        help
 

diff --git a/drivers/media/test-drivers/vivid/Kconfig b/drivers/media/test-drivers/vivid/Kconfig
index 5b08a5ad291ee306315bffd7cfca0a281809c161..ec2e71d769659492df698a7e0874ce5e927042ed 100644 (file)
--- a/drivers/media/test-drivers/vivid/Kconfig
+++ b/drivers/media/test-drivers/vivid/Kconfig
@@ -10,7 +10,6 @@ config VIDEO_VIVID
        select VIDEOBUF2_DMA_CONTIG
        select VIDEO_V4L2_TPG
        select MEDIA_CONTROLLER
-       select MEDIA_CONTROLLER_REQUEST_API
        help
          Enables a virtual video driver. This driver emulates a webcam,
          TV, S-Video and HDMI capture hardware, including VBI support for

diff --git a/drivers/staging/media/rkvdec/Kconfig b/drivers/staging/media/rkvdec/Kconfig
index e963d60cc6ad578055e4db1f9d4e145ed5145c18..5f3bdd848a2cf65b3b0cda78d6bd255c9826cb47 100644 (file)
--- a/drivers/staging/media/rkvdec/Kconfig
+++ b/drivers/staging/media/rkvdec/Kconfig
@@ -4,7 +4,6 @@ config VIDEO_ROCKCHIP_VDEC
        depends on ARCH_ROCKCHIP || COMPILE_TEST
        depends on VIDEO_DEV
        select MEDIA_CONTROLLER
-       select MEDIA_CONTROLLER_REQUEST_API
        select VIDEOBUF2_DMA_CONTIG
        select VIDEOBUF2_VMALLOC
        select V4L2_MEM2MEM_DEV

diff --git a/drivers/staging/media/sunxi/cedrus/Kconfig b/drivers/staging/media/sunxi/cedrus/Kconfig
index 621944f9907a61938e1e8edcbab020677c8a4867..cb07a343c9c27347be09233ece30ea70025013eb 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/Kconfig
+++ b/drivers/staging/media/sunxi/cedrus/Kconfig
@@ -6,7 +6,6 @@ config VIDEO_SUNXI_CEDRUS
        depends on HAS_DMA
        depends on OF
        select MEDIA_CONTROLLER
-       select MEDIA_CONTROLLER_REQUEST_API
        select SUNXI_SRAM
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV