media: Kconfig: don't use visible for device type select

While making the menu invisible seemed a good idea, there's
a drawback: when the menu is not visible, it is not parsing
the "default" dependency.

So, instead, let's just avoid the items at the menu to be
prompted, by using the "prompt ... if" construction.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 382366b8ab46d5ca45e65e6afee291a066c27a22..0972a42e7e0c759edfcb268e41b516223dbe6085 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -57,13 +57,13 @@ config MEDIA_SUBDRV_AUTOSELECT
          If unsure say Y.
 
 menu "Media device types"
-       visible if MEDIA_SUPPORT_FILTER
 
 #
 # Multimedia support - automatically enable V4L2 and DVB core
 #
 config MEDIA_CAMERA_SUPPORT
-       bool "Cameras and video grabbers"
+       bool
+       prompt "Cameras and video grabbers" if MEDIA_SUPPORT_FILTER
        default y if !MEDIA_SUPPORT_FILTER
        help
          Enable support for webcams and video grabbers.
@@ -71,7 +71,8 @@ config MEDIA_CAMERA_SUPPORT
          Say Y when you have a webcam or a video capture grabber board.
 
 config MEDIA_ANALOG_TV_SUPPORT
-       bool "Analog TV"
+       bool
+       prompt "Analog TV" if MEDIA_SUPPORT_FILTER
        default y if !MEDIA_SUPPORT_FILTER
        help
          Enable analog TV support.
@@ -79,7 +80,8 @@ config MEDIA_ANALOG_TV_SUPPORT
          Say Y when you have a board with analog TV support.
 
 config MEDIA_DIGITAL_TV_SUPPORT
-       bool "Digital TV"
+       bool
+       prompt "Digital TV" if MEDIA_SUPPORT_FILTER
        default y if !MEDIA_SUPPORT_FILTER
        help
          Enable digital TV support.
@@ -87,7 +89,8 @@ config MEDIA_DIGITAL_TV_SUPPORT
          Say Y when you have a board with digital TV support.
 
 config MEDIA_RADIO_SUPPORT
-       bool "AM/FM radio receivers/transmitters"
+       bool
+       prompt "AM/FM radio receivers/transmitters" if MEDIA_SUPPORT_FILTER
        default y if !MEDIA_SUPPORT_FILTER
        help
          Enable AM/FM radio support.
@@ -98,7 +101,8 @@ config MEDIA_RADIO_SUPPORT
          Say Y when you have a board with radio support.
 
 config MEDIA_SDR_SUPPORT
-       bool "Software defined radio"
+       bool
+       prompt "Software defined radio" if MEDIA_SUPPORT_FILTER
        default y if !MEDIA_SUPPORT_FILTER
        help
          Enable software defined radio support.
@@ -106,7 +110,8 @@ config MEDIA_SDR_SUPPORT
          Say Y when you have a software defined radio device.
 
 config MEDIA_CEC_SUPPORT
-       bool "HDMI CEC"
+       bool
+       prompt "HDMI CEC support" if MEDIA_SUPPORT_FILTER
        default y if !MEDIA_SUPPORT_FILTER
        help
          Enable support for HDMI CEC (Consumer Electronics Control),
@@ -116,7 +121,8 @@ config MEDIA_CEC_SUPPORT
          adapter that supports HDMI CEC.
 
 config MEDIA_PLATFORM_SUPPORT
-       bool "Platform-specific devices"
+       bool
+       prompt "Platform-specific devices" if MEDIA_SUPPORT_FILTER
        default y if !MEDIA_SUPPORT_FILTER
        help
          Enable support for complex cameras, codecs, and other hardware
@@ -129,7 +135,8 @@ config MEDIA_PLATFORM_SUPPORT
          Say Y when you want to be able so see such devices.
 
 config MEDIA_TEST_SUPPORT
-       bool "Test drivers"
+       bool
+       prompt "Test drivers" if MEDIA_SUPPORT_FILTER
        default y if !MEDIA_SUPPORT_FILTER
        help
          Those drivers should not be used on production Kernels, but