drivers/pps: use surrounding "if PPS" to remove numerous dependency checks

Adding high-level "if PPS" makes lower-level dependency tests superfluous.

Link: http://lkml.kernel.org/r/alpine.LFD.2.20.1708261050500.8156@localhost.localdomain
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Acked-by: Rodolfo Giometti <giometti@enneenne.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 8 insertions, 9 deletions

diff --git a/drivers/pps/Kconfig b/drivers/pps/Kconfig
index 4b29a7182d7b..c6008f296605 100644
--- a/drivers/pps/Kconfig
+++ b/drivers/pps/Kconfig
@@ -19,9 +19,10 @@ menuconfig PPS
           To compile this driver as a module, choose M here: the module
           will be called pps_core.ko.
 
+if PPS
+
 config PPS_DEBUG
         bool "PPS debugging messages"
-        depends on PPS
         help
           Say Y here if you want the PPS support to produce a bunch of debug
           messages to the system log.  Select this if you are having a
@@ -29,7 +30,7 @@ config PPS_DEBUG
 
 config NTP_PPS
         bool "PPS kernel consumer support"
-        depends on PPS && !NO_HZ_COMMON
+        depends on !NO_HZ_COMMON
         help
           This option adds support for direct in-kernel time
           synchronization using an external PPS signal.
@@ -39,3 +40,5 @@ config NTP_PPS
 source drivers/pps/clients/Kconfig
 
 source drivers/pps/generators/Kconfig
+
+endif # PPS
diff --git a/drivers/pps/clients/Kconfig b/drivers/pps/clients/Kconfig
index efec021ce662..7f02a9b1a1fd 100644
--- a/drivers/pps/clients/Kconfig
+++ b/drivers/pps/clients/Kconfig
@@ -3,11 +3,9 @@
 #
 
 comment "PPS clients support"
-        depends on PPS
 
 config PPS_CLIENT_KTIMER
         tristate "Kernel timer client (Testing client, use for debug)"
-        depends on PPS
         help
           If you say yes here you get support for a PPS debugging client
           which uses a kernel timer to generate the PPS signal.
@@ -17,21 +15,20 @@ config PPS_CLIENT_KTIMER
 
 config PPS_CLIENT_LDISC
         tristate "PPS line discipline"
-        depends on PPS && TTY
+        depends on TTY
         help
           If you say yes here you get support for a PPS source connected
           with the CD (Carrier Detect) pin of your serial port.
 
 config PPS_CLIENT_PARPORT
         tristate "Parallel port PPS client"
-        depends on PPS && PARPORT
+        depends on PARPORT
         help
           If you say yes here you get support for a PPS source connected
           with the interrupt pin of your parallel port.
 
 config PPS_CLIENT_GPIO
         tristate "PPS client using GPIO"
-        depends on PPS
         help
           If you say yes here you get support for a PPS source using
           GPIO. To be useful you must also register a platform device
diff --git a/drivers/pps/generators/Kconfig b/drivers/pps/generators/Kconfig
index 86b59378e71f..e4c4f3dc0728 100644
--- a/drivers/pps/generators/Kconfig
+++ b/drivers/pps/generators/Kconfig
@@ -3,11 +3,10 @@
 #
 
 comment "PPS generators support"
-        depends on PPS
 
 config PPS_GENERATOR_PARPORT
         tristate "Parallel port PPS signal generator"
-        depends on PPS && PARPORT && BROKEN
+        depends on PARPORT && BROKEN
         help
           If you say yes here you get support for a PPS signal generator which
           utilizes STROBE pin of a parallel port to send PPS signals. It uses