media: fix media Kconfig help syntax issues

The help text should be indented by at least two spaces after the
'help' separator. This is both good practice and the media_build system
for building media drivers makes this assumption.

I went through all Kconfigs under drivers/media and fixed any bad help
sections. This makes it conform to the common practice and should fix
problems with 'make menuconfig' when using media_build. This is due to
a "WARNING" message that media_build can insert in the Kconfig and that
assumes the help text is indented by at least two spaces. If not, then the
Kconfig becomes invalid and 'make menuconfig' fails.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reported-by: Thomas Kaiser <linux-dvb@kaiser-linux.li>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index 2631d0e0a024d4989d8ff14e3fc91f714753f756..d17722eb445647655af17ced05b690aba8471df4 100644 (file)
--- a/drivers/media/dvb-frontends/Kconfig
+++ b/drivers/media/dvb-frontends/Kconfig
@@ -173,7 +173,7 @@ config DVB_STB6000
        tristate "ST STB6000 silicon tuner"
        depends on DVB_CORE && I2C
        default m if !MEDIA_SUBDRV_AUTOSELECT
-         help
+       help
          A DVB-S silicon tuner module. Say Y when you want to support this tuner.
 
 config DVB_STV0299
@@ -187,7 +187,7 @@ config DVB_STV6110
        tristate "ST STV6110 silicon tuner"
        depends on DVB_CORE && I2C
        default m if !MEDIA_SUBDRV_AUTOSELECT
-         help
+       help
          A DVB-S silicon tuner module. Say Y when you want to support this tuner.
 
 config DVB_STV0900
@@ -902,7 +902,7 @@ config DVB_HELENE
        depends on DVB_CORE && I2C
        default m if !MEDIA_SUBDRV_AUTOSELECT
        help
-       Say Y when you want to support this frontend.
+         Say Y when you want to support this frontend.
 
 comment "Tools to develop new frontends"
 

diff --git a/drivers/media/pci/b2c2/Kconfig b/drivers/media/pci/b2c2/Kconfig
index 58761a21caa03705b2afe0d411964a8ea0bcc618..7b818d445f3992cbf7b249f58ab63869d123550c 100644 (file)
--- a/drivers/media/pci/b2c2/Kconfig
+++ b/drivers/media/pci/b2c2/Kconfig
@@ -11,5 +11,5 @@ config DVB_B2C2_FLEXCOP_PCI_DEBUG
        depends on DVB_B2C2_FLEXCOP_PCI
        select DVB_B2C2_FLEXCOP_DEBUG
        help
-       Say Y if you want to enable the module option to control debug messages
-       of all B2C2 FlexCop drivers.
+         Say Y if you want to enable the module option to control debug messages
+         of all B2C2 FlexCop drivers.

diff --git a/drivers/media/pci/netup_unidvb/Kconfig b/drivers/media/pci/netup_unidvb/Kconfig
index 0ad37714c7fd9a8566def4f6ddd867f85cb0fb87..b663154d0cc49ef240419616e7a877d34582fb19 100644 (file)
--- a/drivers/media/pci/netup_unidvb/Kconfig
+++ b/drivers/media/pci/netup_unidvb/Kconfig
@@ -1,8 +1,8 @@
 config DVB_NETUP_UNIDVB
        tristate "NetUP Universal DVB card support"
        depends on DVB_CORE && VIDEO_DEV && PCI && I2C && SPI_MASTER
-    select VIDEOBUF2_DVB
-    select VIDEOBUF2_VMALLOC
+       select VIDEOBUF2_DVB
+       select VIDEOBUF2_VMALLOC
        select DVB_HORUS3A if MEDIA_SUBDRV_AUTOSELECT
        select DVB_ASCOT2E if MEDIA_SUBDRV_AUTOSELECT
        select DVB_HELENE if MEDIA_SUBDRV_AUTOSELECT
@@ -10,8 +10,8 @@ config DVB_NETUP_UNIDVB
        select DVB_CXD2841ER if MEDIA_SUBDRV_AUTOSELECT
        ---help---
          Support for NetUP PCI express Universal DVB card.
-     help
-       Say Y when you want to support NetUP Dual Universal DVB card
-       Card can receive two independent streams in following standards:
+
+         Say Y when you want to support NetUP Dual Universal DVB card.
+         Card can receive two independent streams in following standards:
                DVB-S/S2, T/T2, C/C2
-       Two CI slots available for CAM modules.
+         Two CI slots available for CAM modules.

diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/exynos4-is/Kconfig
index c480efb755f5d42617a62f209719b00aacdb8131..46a7d242a1a5ccdadf1998c7fab61aedeb31b170 100644 (file)
--- a/drivers/media/platform/exynos4-is/Kconfig
+++ b/drivers/media/platform/exynos4-is/Kconfig
@@ -76,7 +76,7 @@ config VIDEO_EXYNOS4_ISP_DMA_CAPTURE
        depends on VIDEO_EXYNOS4_FIMC_IS
        select VIDEO_EXYNOS4_IS_COMMON
        default y
-         help
+       help
          This option enables an additional video device node exposing a V4L2
          video capture interface for the FIMC-IS ISP raw (Bayer) capture DMA.
 

diff --git a/drivers/media/radio/wl128x/Kconfig b/drivers/media/radio/wl128x/Kconfig
index c9e349b169c44c07bc705633a12ea2a8153fc5ab..2add222ea346de2b41243f68275531fb39a3c986 100644 (file)
--- a/drivers/media/radio/wl128x/Kconfig
+++ b/drivers/media/radio/wl128x/Kconfig
@@ -7,11 +7,11 @@ config RADIO_WL128X
        depends on VIDEO_V4L2 && RFKILL && TTY && TI_ST
        depends on GPIOLIB || COMPILE_TEST
        help
-       Choose Y here if you have this FM radio chip.
+         Choose Y here if you have this FM radio chip.
 
-       In order to control your radio card, you will need to use programs
-       that are compatible with the Video For Linux 2 API.  Information on
-       this API and pointers to "v4l2" programs may be found at
-       <file:Documentation/video4linux/API.html>.
+         In order to control your radio card, you will need to use programs
+         that are compatible with the Video For Linux 2 API.  Information on
+         this API and pointers to "v4l2" programs may be found at
+         <file:Documentation/video4linux/API.html>.
 
 endmenu

diff --git a/drivers/media/usb/b2c2/Kconfig b/drivers/media/usb/b2c2/Kconfig
index 17d35833980c5d36a66c95487f64b1fd9d6b59ca..a620ae42dfc815fc8d8dd1bea709e20e55f3c9e8 100644 (file)
--- a/drivers/media/usb/b2c2/Kconfig
+++ b/drivers/media/usb/b2c2/Kconfig
@@ -10,6 +10,6 @@ config DVB_B2C2_FLEXCOP_USB_DEBUG
        bool "Enable debug for the B2C2 FlexCop drivers"
        depends on DVB_B2C2_FLEXCOP_USB
        select DVB_B2C2_FLEXCOP_DEBUG
-          help
-       Say Y if you want to enable the module option to control debug messages
-       of all B2C2 FlexCop drivers.
+       help
+         Say Y if you want to enable the module option to control debug messages
+         of all B2C2 FlexCop drivers.

diff --git a/drivers/media/usb/gspca/Kconfig b/drivers/media/usb/gspca/Kconfig
index 3fd94fe7e1eb1652b7dfc5df4d5983f3733eb65b..d214a21acff770fe6f024fcf685912b228ef67e9 100644 (file)
--- a/drivers/media/usb/gspca/Kconfig
+++ b/drivers/media/usb/gspca/Kconfig
@@ -204,11 +204,11 @@ config USB_GSPCA_SE401
        tristate "SE401 USB Camera Driver"
        depends on VIDEO_V4L2 && USB_GSPCA
        help
-        Say Y here if you want support for cameras based on the
-        Endpoints (formerly known as AOX) se401 chip.
+         Say Y here if you want support for cameras based on the
+         Endpoints (formerly known as AOX) se401 chip.
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_se401.
+         To compile this driver as a module, choose M here: the
+         module will be called gspca_se401.
 
 config USB_GSPCA_SN9C2028
        tristate "SONIX Dual-Mode USB Camera Driver"
@@ -224,11 +224,11 @@ config USB_GSPCA_SN9C20X
        tristate "SN9C20X USB Camera Driver"
        depends on VIDEO_V4L2 && USB_GSPCA
        help
-        Say Y here if you want support for cameras based on the
-        sn9c20x chips (SN9C201 and SN9C202).
+         Say Y here if you want support for cameras based on the
+         sn9c20x chips (SN9C201 and SN9C202).
 
-        To compile this driver as a module, choose M here: the
-        module will be called gspca_sn9c20x.
+         To compile this driver as a module, choose M here: the
+         module will be called gspca_sn9c20x.
 
 config USB_GSPCA_SONIXB
        tristate "SONIX Bayer USB Camera Driver"

diff --git a/drivers/media/usb/pvrusb2/Kconfig b/drivers/media/usb/pvrusb2/Kconfig
index 60a2604e4cb39c00156402d57abadc76b8c8ee37..1ad913fc30bf585393a74dfbc0fabaf7350fd8a4 100644 (file)
--- a/drivers/media/usb/pvrusb2/Kconfig
+++ b/drivers/media/usb/pvrusb2/Kconfig
@@ -44,7 +44,6 @@ config VIDEO_PVRUSB2_DVB
        select MEDIA_TUNER_SIMPLE if MEDIA_SUBDRV_AUTOSELECT
        select MEDIA_TUNER_TDA8290 if MEDIA_SUBDRV_AUTOSELECT
        ---help---
-
          This option enables a DVB interface for the pvrusb2 driver.
          If your device does not support digital television, this
          feature will have no affect on the driver's operation.