tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Robert P. J. Day and committed by
Linus Torvalds ab4f5260 a2d81803

+8 -9
+5 -2
drivers/pps/Kconfig
··· 19 19 To compile this driver as a module, choose M here: the module 20 20 will be called pps_core.ko. 21 21 22 + if PPS 23 + 22 24 config PPS_DEBUG 23 25 bool "PPS debugging messages" 24 - depends on PPS 25 26 help 26 27 Say Y here if you want the PPS support to produce a bunch of debug 27 28 messages to the system log. Select this if you are having a ··· 30 29 31 30 config NTP_PPS 32 31 bool "PPS kernel consumer support" 33 - depends on PPS && !NO_HZ_COMMON 32 + depends on !NO_HZ_COMMON 34 33 help 35 34 This option adds support for direct in-kernel time 36 35 synchronization using an external PPS signal. ··· 40 39 source drivers/pps/clients/Kconfig 41 40 42 41 source drivers/pps/generators/Kconfig 42 + 43 + endif # PPS
+2 -5
drivers/pps/clients/Kconfig
··· 3 3 # 4 4 5 5 comment "PPS clients support" 6 - depends on PPS 7 6 8 7 config PPS_CLIENT_KTIMER 9 8 tristate "Kernel timer client (Testing client, use for debug)" 10 - depends on PPS 11 9 help 12 10 If you say yes here you get support for a PPS debugging client 13 11 which uses a kernel timer to generate the PPS signal. ··· 15 17 16 18 config PPS_CLIENT_LDISC 17 19 tristate "PPS line discipline" 18 - depends on PPS && TTY 20 + depends on TTY 19 21 help 20 22 If you say yes here you get support for a PPS source connected 21 23 with the CD (Carrier Detect) pin of your serial port. 22 24 23 25 config PPS_CLIENT_PARPORT 24 26 tristate "Parallel port PPS client" 25 - depends on PPS && PARPORT 27 + depends on PARPORT 26 28 help 27 29 If you say yes here you get support for a PPS source connected 28 30 with the interrupt pin of your parallel port. 29 31 30 32 config PPS_CLIENT_GPIO 31 33 tristate "PPS client using GPIO" 32 - depends on PPS 33 34 help 34 35 If you say yes here you get support for a PPS source using 35 36 GPIO. To be useful you must also register a platform device
+1 -2
drivers/pps/generators/Kconfig
··· 3 3 # 4 4 5 5 comment "PPS generators support" 6 - depends on PPS 7 6 8 7 config PPS_GENERATOR_PARPORT 9 8 tristate "Parallel port PPS signal generator" 10 - depends on PPS && PARPORT && BROKEN 9 + depends on PARPORT && BROKEN 11 10 help 12 11 If you say yes here you get support for a PPS signal generator which 13 12 utilizes STROBE pin of a parallel port to send PPS signals. It uses