[PATCH] media: Replace dependency on VIDEO_V4L2_SUBDEV_API with select

[PATCH] media: Replace dependency on VIDEO_V4L2_SUBDEV_API with select

[Laurent Pinchart]

From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

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>
---
 drivers/media/i2c/Kconfig            | 3 ++-
 drivers/media/platform/atmel/Kconfig | 3 ++-
 drivers/media/v4l2-core/Kconfig      | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 2b20aa6c37b1..51fc3fb72d95 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -75,8 +75,9 @@ 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 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 83aebee0c8eb..da8ffc39d11d 100644
--- a/drivers/media/platform/atmel/Kconfig
+++ b/drivers/media/platform/atmel/Kconfig
@@ -20,12 +20,13 @@ 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 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 1be9a2cc947a..5141c8215b2f 100644
--- 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,10 @@ 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 V4L2_ASYNC
+	select VIDEO_V4L2_SUBDEV_API
 	help
 	  Say Y here to enable V4L2 flash API support for LED flash
 	  class drivers.
-- 
Regards,

Laurent Pinchart

Re: [PATCH] media: Replace dependency on VIDEO_V4L2_SUBDEV_API with select

[Ezequiel Garcia]

On Thu, Jun 16, 2022 at 07:36:32PM +0300, Laurent Pinchart wrote:
> From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> 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>

Makes sense.

Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>

> ---
>  drivers/media/i2c/Kconfig            | 3 ++-
>  drivers/media/platform/atmel/Kconfig | 3 ++-
>  drivers/media/v4l2-core/Kconfig      | 5 +++--
>  3 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
> index 2b20aa6c37b1..51fc3fb72d95 100644
> --- a/drivers/media/i2c/Kconfig
> +++ b/drivers/media/i2c/Kconfig
> @@ -75,8 +75,9 @@ 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 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 83aebee0c8eb..da8ffc39d11d 100644
> --- a/drivers/media/platform/atmel/Kconfig
> +++ b/drivers/media/platform/atmel/Kconfig
> @@ -20,12 +20,13 @@ 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 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 1be9a2cc947a..5141c8215b2f 100644
> --- 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,10 @@ 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 V4L2_ASYNC
> +	select VIDEO_V4L2_SUBDEV_API
>  	help
>  	  Say Y here to enable V4L2 flash API support for LED flash
>  	  class drivers.
> -- 
> Regards,
> 
> Laurent Pinchart
> 

Re: [PATCH] media: Replace dependency on VIDEO_V4L2_SUBDEV_API with select

[kernel test robot]

Hi Laurent,

I love your patch! Perhaps something to improve:

[auto build test WARNING on media-tree/master]
[also build test WARNING on linus/master v5.19-rc2 next-20220617]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/intel-lab-lkp/linux/commits/Laurent-Pinchart/media-Replace-dependency-on-VIDEO_V4L2_SUBDEV_API-with-select/20220617-003721
base:   git://linuxtv.org/media_tree.git master
config: (https://download.01.org/0day-ci/archive/20220618/202206180224.IQyAlsqP-lkp@intel.com/config)
reproduce:
        # https://github.com/intel-lab-lkp/linux/commit/efc926771b1dc55aaa144308fd649aa1bc6e69ba
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Laurent-Pinchart/media-Replace-dependency-on-VIDEO_V4L2_SUBDEV_API-with-select/20220617-003721
        git checkout efc926771b1dc55aaa144308fd649aa1bc6e69ba
        # 1. reproduce by kismet
           # install kmax per https://github.com/paulgazz/kmax/blob/master/README.md
           kismet --linux-ksrc=linux --selectees CONFIG_VIDEO_V4L2_SUBDEV_API --selectors CONFIG_V4L2_FLASH_LED_CLASS -a=x86_64
        # 2. reproduce by make
           # save the config file to linux source tree
           cd linux
           make ARCH=x86_64 olddefconfig

If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <lkp@intel.com>


kismet warnings: (new ones prefixed by >>)
>> kismet: WARNING: unmet direct dependencies detected for VIDEO_V4L2_SUBDEV_API when selected by V4L2_FLASH_LED_CLASS
   
   WARNING: unmet direct dependencies detected for VIDEO_V4L2_SUBDEV_API
     Depends on [n]: MEDIA_SUPPORT [=y] && VIDEO_DEV [=y] && MEDIA_CONTROLLER [=n]
     Selected by [y]:
     - V4L2_FLASH_LED_CLASS [=y] && MEDIA_SUPPORT [=y] && VIDEO_DEV [=y] && LEDS_CLASS_FLASH [=y]

-- 
0-DAY CI Kernel Test Service
https://01.org/lkp

Re: [PATCH] media: Replace dependency on VIDEO_V4L2_SUBDEV_API with select

[kernel test robot]

Hi Laurent,

I love your patch! Perhaps something to improve:

[auto build test WARNING on media-tree/master]
[also build test WARNING on linus/master v5.19-rc2 next-20220617]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/intel-lab-lkp/linux/commits/Laurent-Pinchart/media-Replace-dependency-on-VIDEO_V4L2_SUBDEV_API-with-select/20220617-003721
base:   git://linuxtv.org/media_tree.git master
config: (https://download.01.org/0day-ci/archive/20220618/202206180756.PjHKYkkX-lkp@intel.com/config)
reproduce:
        # https://github.com/intel-lab-lkp/linux/commit/efc926771b1dc55aaa144308fd649aa1bc6e69ba
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Laurent-Pinchart/media-Replace-dependency-on-VIDEO_V4L2_SUBDEV_API-with-select/20220617-003721
        git checkout efc926771b1dc55aaa144308fd649aa1bc6e69ba
        # 1. reproduce by kismet
           # install kmax per https://github.com/paulgazz/kmax/blob/master/README.md
           kismet --linux-ksrc=linux --selectees CONFIG_VIDEO_V4L2_SUBDEV_API --selectors CONFIG_VIDEO_ATMEL_XISC -a=x86_64
        # 2. reproduce by make
           # save the config file to linux source tree
           cd linux
           make ARCH=x86_64 olddefconfig

If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <lkp@intel.com>


kismet warnings: (new ones prefixed by >>)
>> kismet: WARNING: unmet direct dependencies detected for VIDEO_V4L2_SUBDEV_API when selected by VIDEO_ATMEL_XISC
   
   WARNING: unmet direct dependencies detected for VIDEO_V4L2_SUBDEV_API
     Depends on [n]: MEDIA_SUPPORT [=y] && VIDEO_DEV [=y] && MEDIA_CONTROLLER [=n]
     Selected by [y]:
     - VIDEO_ATMEL_XISC [=y] && MEDIA_SUPPORT [=y] && MEDIA_PLATFORM_SUPPORT [=y] && MEDIA_PLATFORM_DRIVERS [=y] && V4L_PLATFORM_DRIVERS [=y] && VIDEO_DEV [=y] && COMMON_CLK [=y] && (ARCH_AT91 || COMPILE_TEST [=y])

-- 
0-DAY CI Kernel Test Service
https://01.org/lkp

Re: [PATCH] media: Replace dependency on VIDEO_V4L2_SUBDEV_API with select

[kernel test robot]

Hi Laurent,

I love your patch! Perhaps something to improve:

[auto build test WARNING on media-tree/master]
[also build test WARNING on linus/master v5.19-rc2 next-20220617]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/intel-lab-lkp/linux/commits/Laurent-Pinchart/media-Replace-dependency-on-VIDEO_V4L2_SUBDEV_API-with-select/20220617-003721
base:   git://linuxtv.org/media_tree.git master
config: (https://download.01.org/0day-ci/archive/20220618/202206181114.qnuagBIA-lkp@intel.com/config)
reproduce:
        # https://github.com/intel-lab-lkp/linux/commit/efc926771b1dc55aaa144308fd649aa1bc6e69ba
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Laurent-Pinchart/media-Replace-dependency-on-VIDEO_V4L2_SUBDEV_API-with-select/20220617-003721
        git checkout efc926771b1dc55aaa144308fd649aa1bc6e69ba
        # 1. reproduce by kismet
           # install kmax per https://github.com/paulgazz/kmax/blob/master/README.md
           kismet --linux-ksrc=linux --selectees CONFIG_VIDEO_V4L2_SUBDEV_API --selectors CONFIG_VIDEO_IMX208 -a=x86_64
        # 2. reproduce by make
           # save the config file to linux source tree
           cd linux
           make ARCH=x86_64 olddefconfig

If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <lkp@intel.com>


kismet warnings: (new ones prefixed by >>)
>> kismet: WARNING: unmet direct dependencies detected for VIDEO_V4L2_SUBDEV_API when selected by VIDEO_IMX208
   
   WARNING: unmet direct dependencies detected for VIDEO_V4L2_SUBDEV_API
     Depends on [n]: MEDIA_SUPPORT [=y] && VIDEO_DEV [=y] && MEDIA_CONTROLLER [=n]
     Selected by [y]:
     - VIDEO_IMX208 [=y] && MEDIA_SUPPORT [=y] && I2C [=y] && VIDEO_DEV [=y] && MEDIA_CAMERA_SUPPORT [=y]

-- 
0-DAY CI Kernel Test Service
https://01.org/lkp