media: staging: media: zoran: move config select on primary kconfig

Since all kconfigs for card selection are bool, this causes all selected
modules to be always built-in.
Prevent this by moving selects to the main tristate kconfig.

By doing this, remove also all "if MEDIA_SUBDRV_AUTOSELECT" which are
wrong, since zoran always need them to work.

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

diff --git a/drivers/staging/media/zoran/Kconfig b/drivers/staging/media/zoran/Kconfig
index 4067fa93d44d0382b495aa8cf77ee42708334ae7..faef008b85544feeb619511beb75d0aa9bed587e 100644 (file)
--- a/drivers/staging/media/zoran/Kconfig
+++ b/drivers/staging/media/zoran/Kconfig
@@ -4,6 +4,16 @@ config VIDEO_ZORAN
        depends on !ALPHA
        depends on DEBUG_FS
        select VIDEOBUF2_DMA_CONTIG
+       select VIDEO_ADV7170 if VIDEO_ZORAN_LML33R10
+       select VIDEO_ADV7175 if VIDEO_ZORAN_DC10 || VIDEO_ZORAN_DC30
+       select VIDEO_BT819 if VIDEO_ZORAN_LML33
+       select VIDEO_BT856 if VIDEO_ZORAN_LML33 || VIDEO_ZORAN_AVS6EYES
+       select VIDEO_BT866 if VIDEO_ZORAN_AVS6EYES
+       select VIDEO_KS0127 if VIDEO_ZORAN_AVS6EYES
+       select VIDEO_SAA711X if VIDEO_ZORAN_BUZ || VIDEO_ZORAN_LML33R10
+       select VIDEO_SAA7110 if VIDEO_ZORAN_DC10
+       select VIDEO_SAA7185 if VIDEO_ZORAN_BUZ
+       select VIDEO_VPX3220 if VIDEO_ZORAN_DC30
        help
          Say Y for support for MJPEG capture cards based on the Zoran
          36057/36067 PCI controller chipset. This includes the Iomega
@@ -17,8 +27,6 @@ config VIDEO_ZORAN
 config VIDEO_ZORAN_DC30
        bool "Pinnacle/Miro DC30(+) support"
        depends on VIDEO_ZORAN
-       select VIDEO_ADV7175 if MEDIA_SUBDRV_AUTOSELECT
-       select VIDEO_VPX3220 if MEDIA_SUBDRV_AUTOSELECT
        help
          Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback
          card. This also supports really old DC10 cards based on the
@@ -35,16 +43,12 @@ config VIDEO_ZORAN_ZR36060
 config VIDEO_ZORAN_BUZ
        bool "Iomega Buz support"
        depends on VIDEO_ZORAN_ZR36060
-       select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT
-       select VIDEO_SAA7185 if MEDIA_SUBDRV_AUTOSELECT
        help
          Support for the Iomega Buz MJPEG capture/playback card.
 
 config VIDEO_ZORAN_DC10
        bool "Pinnacle/Miro DC10(+) support"
        depends on VIDEO_ZORAN_ZR36060
-       select VIDEO_SAA7110 if MEDIA_SUBDRV_AUTOSELECT
-       select VIDEO_ADV7175 if MEDIA_SUBDRV_AUTOSELECT
        help
          Support for the Pinnacle/Miro DC10(+) MJPEG capture/playback
          card.
@@ -52,8 +56,6 @@ config VIDEO_ZORAN_DC10
 config VIDEO_ZORAN_LML33
        bool "Linux Media Labs LML33 support"
        depends on VIDEO_ZORAN_ZR36060
-       select VIDEO_BT819 if MEDIA_SUBDRV_AUTOSELECT
-       select VIDEO_BT856 if MEDIA_SUBDRV_AUTOSELECT
        help
          Support for the Linux Media Labs LML33 MJPEG capture/playback
          card.
@@ -61,8 +63,6 @@ config VIDEO_ZORAN_LML33
 config VIDEO_ZORAN_LML33R10
        bool "Linux Media Labs LML33R10 support"
        depends on VIDEO_ZORAN_ZR36060
-       select VIDEO_SAA711X if MEDIA_SUBDRV_AUTOSELECT
-       select VIDEO_ADV7170 if MEDIA_SUBDRV_AUTOSELECT
        help
          support for the Linux Media Labs LML33R10 MJPEG capture/playback
          card.
@@ -70,8 +70,5 @@ config VIDEO_ZORAN_LML33R10
 config VIDEO_ZORAN_AVS6EYES
        bool "AverMedia 6 Eyes support"
        depends on VIDEO_ZORAN_ZR36060
-       select VIDEO_BT856 if MEDIA_SUBDRV_AUTOSELECT
-       select VIDEO_BT866 if MEDIA_SUBDRV_AUTOSELECT
-       select VIDEO_KS0127 if MEDIA_SUBDRV_AUTOSELECT
        help
          Support for the AverMedia 6 Eyes video surveillance card.