Commit ab4f5260 authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Linus Torvalds

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.localdomainSigned-off-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
Acked-by: default avatarRodolfo Giometti <giometti@enneenne.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a2d81803
...@@ -19,9 +19,10 @@ menuconfig PPS ...@@ -19,9 +19,10 @@ menuconfig PPS
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called pps_core.ko. will be called pps_core.ko.
if PPS
config PPS_DEBUG config PPS_DEBUG
bool "PPS debugging messages" bool "PPS debugging messages"
depends on PPS
help help
Say Y here if you want the PPS support to produce a bunch of debug 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 messages to the system log. Select this if you are having a
...@@ -29,7 +30,7 @@ config PPS_DEBUG ...@@ -29,7 +30,7 @@ config PPS_DEBUG
config NTP_PPS config NTP_PPS
bool "PPS kernel consumer support" bool "PPS kernel consumer support"
depends on PPS && !NO_HZ_COMMON depends on !NO_HZ_COMMON
help help
This option adds support for direct in-kernel time This option adds support for direct in-kernel time
synchronization using an external PPS signal. synchronization using an external PPS signal.
...@@ -39,3 +40,5 @@ config NTP_PPS ...@@ -39,3 +40,5 @@ config NTP_PPS
source drivers/pps/clients/Kconfig source drivers/pps/clients/Kconfig
source drivers/pps/generators/Kconfig source drivers/pps/generators/Kconfig
endif # PPS
...@@ -3,11 +3,9 @@ ...@@ -3,11 +3,9 @@
# #
comment "PPS clients support" comment "PPS clients support"
depends on PPS
config PPS_CLIENT_KTIMER config PPS_CLIENT_KTIMER
tristate "Kernel timer client (Testing client, use for debug)" tristate "Kernel timer client (Testing client, use for debug)"
depends on PPS
help help
If you say yes here you get support for a PPS debugging client If you say yes here you get support for a PPS debugging client
which uses a kernel timer to generate the PPS signal. which uses a kernel timer to generate the PPS signal.
...@@ -17,21 +15,20 @@ config PPS_CLIENT_KTIMER ...@@ -17,21 +15,20 @@ config PPS_CLIENT_KTIMER
config PPS_CLIENT_LDISC config PPS_CLIENT_LDISC
tristate "PPS line discipline" tristate "PPS line discipline"
depends on PPS && TTY depends on TTY
help help
If you say yes here you get support for a PPS source connected If you say yes here you get support for a PPS source connected
with the CD (Carrier Detect) pin of your serial port. with the CD (Carrier Detect) pin of your serial port.
config PPS_CLIENT_PARPORT config PPS_CLIENT_PARPORT
tristate "Parallel port PPS client" tristate "Parallel port PPS client"
depends on PPS && PARPORT depends on PARPORT
help help
If you say yes here you get support for a PPS source connected If you say yes here you get support for a PPS source connected
with the interrupt pin of your parallel port. with the interrupt pin of your parallel port.
config PPS_CLIENT_GPIO config PPS_CLIENT_GPIO
tristate "PPS client using GPIO" tristate "PPS client using GPIO"
depends on PPS
help help
If you say yes here you get support for a PPS source using If you say yes here you get support for a PPS source using
GPIO. To be useful you must also register a platform device GPIO. To be useful you must also register a platform device
......
...@@ -3,11 +3,10 @@ ...@@ -3,11 +3,10 @@
# #
comment "PPS generators support" comment "PPS generators support"
depends on PPS
config PPS_GENERATOR_PARPORT config PPS_GENERATOR_PARPORT
tristate "Parallel port PPS signal generator" tristate "Parallel port PPS signal generator"
depends on PPS && PARPORT && BROKEN depends on PARPORT && BROKEN
help help
If you say yes here you get support for a PPS signal generator which 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 utilizes STROBE pin of a parallel port to send PPS signals. It uses
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment