media: Replace dependency on VIDEO_V4L2_SUBDEV_API with select

The VIDEO_V4L2_SUBDEV_API Kconfig symbol is mostly selected
automatically, with a a handful of drivers still using it as a
dependency. Fix them to use selection, and drop the symbol title text to
not expose it for manual selection.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 9f27416..e0658c6 100644 (file)
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -88,8 +88,10 @@ config VIDEO_HI847
 
 config VIDEO_IMX208
        tristate "Sony IMX208 sensor support"
-       depends on I2C && VIDEO_DEV && VIDEO_V4L2_SUBDEV_API
+       depends on I2C && VIDEO_DEV
        depends on MEDIA_CAMERA_SUPPORT
+       select MEDIA_CONTROLLER
+       select VIDEO_V4L2_SUBDEV_API
        help
          This is a Video4Linux2 sensor driver for the Sony
          IMX208 camera.

diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/atmel/Kconfig
index 83aebee..f399dba 100644 (file)
--- a/drivers/media/platform/atmel/Kconfig
+++ b/drivers/media/platform/atmel/Kconfig
@@ -20,12 +20,14 @@ config VIDEO_ATMEL_ISC
 config VIDEO_ATMEL_XISC
        tristate "ATMEL eXtended Image Sensor Controller (XISC) support"
        depends on V4L_PLATFORM_DRIVERS
-       depends on VIDEO_DEV && COMMON_CLK && VIDEO_V4L2_SUBDEV_API
+       depends on VIDEO_DEV && COMMON_CLK
        depends on ARCH_AT91 || COMPILE_TEST
        select VIDEOBUF2_DMA_CONTIG
        select REGMAP_MMIO
        select V4L2_FWNODE
        select VIDEO_ATMEL_ISC_BASE
+       select MEDIA_CONTROLLER
+       select VIDEO_V4L2_SUBDEV_API
        help
           This module makes the ATMEL eXtended Image Sensor Controller
           available as a v4l2 device.

diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig
index 1be9a2c..348559b 100644 (file)
--- a/drivers/media/v4l2-core/Kconfig
+++ b/drivers/media/v4l2-core/Kconfig
@@ -9,7 +9,7 @@ config VIDEO_V4L2_I2C
        default y
 
 config VIDEO_V4L2_SUBDEV_API
-       bool "V4L2 sub-device userspace API"
+       bool
        depends on VIDEO_DEV && MEDIA_CONTROLLER
        help
          Enables the V4L2 sub-device pad-level userspace API used to configure
@@ -56,9 +56,11 @@ config V4L2_MEM2MEM_DEV
 # Used by LED subsystem flash drivers
 config V4L2_FLASH_LED_CLASS
        tristate "V4L2 flash API for LED flash class devices"
-       depends on VIDEO_DEV && VIDEO_V4L2_SUBDEV_API
+       depends on VIDEO_DEV
        depends on LEDS_CLASS_FLASH
+       select MEDIA_CONTROLLER
        select V4L2_ASYNC
+       select VIDEO_V4L2_SUBDEV_API
        help
          Say Y here to enable V4L2 flash API support for LED flash
          class drivers.