media: Kconfig: Don't expose the Request API option

The Request API isn't meant to be chosen by users,
but instead should be selected by drivers that want
to support it.

Hantro and Cedrus are already selecting the right options,
so only the test drivers need to be fixed.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig
index 002a918c4c75bbb91f34b3e710b9e07aabf23f6d..7c9628f3719688faf881b20a8ca1e4e69588a294 100644 (file)
--- a/drivers/media/mc/Kconfig
+++ b/drivers/media/mc/Kconfig
@@ -2,7 +2,6 @@
 
 #
 # Media controller
-#      Selectable only for webcam/grabbers, as other drivers don't use it
 #
 
 config MEDIA_CONTROLLER_DVB
@@ -14,7 +13,7 @@ config MEDIA_CONTROLLER_DVB
          This is currently experimental.
 
 config MEDIA_CONTROLLER_REQUEST_API
-       bool "Enable Media controller Request API (EXPERIMENTAL)"
+       bool
        depends on MEDIA_CONTROLLER && STAGING_MEDIA
        help
          DO NOT ENABLE THIS OPTION UNLESS YOU KNOW WHAT YOU'RE DOING.
@@ -24,3 +23,6 @@ config MEDIA_CONTROLLER_REQUEST_API
 
          There is currently no intention to provide API or ABI stability for
          this new API as of yet.
+
+comment "Please notice that the enabled Media controller Request API is EXPERIMENTAL"
+       depends on MEDIA_CONTROLLER_REQUEST_API

diff --git a/drivers/media/test_drivers/Kconfig b/drivers/media/test_drivers/Kconfig
index e62abec030c304f08ed6c7a1ef1bcbd94d1f38fc..bb009f5f42457eed725633cff35167e2a9998183 100644 (file)
--- a/drivers/media/test_drivers/Kconfig
+++ b/drivers/media/test_drivers/Kconfig
@@ -15,6 +15,8 @@ config VIDEO_VIM2M
        depends on VIDEO_DEV && VIDEO_V4L2
        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 89456665cb16ca5247e3dba26fee8cbb43fb4ff5..d77c67810c733129f4106f401182430beac827aa 100644 (file)
--- a/drivers/media/test_drivers/vicodec/Kconfig
+++ b/drivers/media/test_drivers/vicodec/Kconfig
@@ -4,6 +4,8 @@ config VIDEO_VICODEC
        depends on VIDEO_DEV && VIDEO_V4L2
        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/vivid/Kconfig b/drivers/media/test_drivers/vivid/Kconfig
index e2ff06edfa93d85a5a23585c7ba0b55e0ce5403a..c3abde2986b2a123d05a979536984ecba4f39d6d 100644 (file)
--- a/drivers/media/test_drivers/vivid/Kconfig
+++ b/drivers/media/test_drivers/vivid/Kconfig
@@ -11,6 +11,8 @@ config VIDEO_VIVID
        select VIDEOBUF2_VMALLOC
        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