Эх сурвалжийг харах

rtc: kconfig: remove unnecessary dependencies.

Remove "depends on RTC_CLASS = y" for multiple Kconfig definitions, as all
of them are already placed under "if RTC_CLASS".

Signed-off-by: Venu Byravarasu <vbyravarasu@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Venu Byravarasu 13 жил өмнө
parent
commit
6b8029fab6

+ 8 - 18
drivers/rtc/Kconfig

@@ -19,7 +19,6 @@ if RTC_CLASS
 
 
 config RTC_HCTOSYS
 config RTC_HCTOSYS
 	bool "Set system time from RTC on startup and resume"
 	bool "Set system time from RTC on startup and resume"
-	depends on RTC_CLASS = y
 	default y
 	default y
 	help
 	help
 	  If you say yes here, the system time (wall clock) will be set using
 	  If you say yes here, the system time (wall clock) will be set using
@@ -51,7 +50,6 @@ config RTC_HCTOSYS_DEVICE
 
 
 config RTC_DEBUG
 config RTC_DEBUG
 	bool "RTC debug support"
 	bool "RTC debug support"
-	depends on RTC_CLASS = y
 	help
 	help
 	  Say yes here to enable debugging support in the RTC framework
 	  Say yes here to enable debugging support in the RTC framework
 	  and individual RTC drivers.
 	  and individual RTC drivers.
@@ -61,7 +59,6 @@ comment "RTC interfaces"
 config RTC_INTF_SYSFS
 config RTC_INTF_SYSFS
 	boolean "/sys/class/rtc/rtcN (sysfs)"
 	boolean "/sys/class/rtc/rtcN (sysfs)"
 	depends on SYSFS
 	depends on SYSFS
-	default RTC_CLASS
 	help
 	help
 	  Say yes here if you want to use your RTCs using sysfs interfaces,
 	  Say yes here if you want to use your RTCs using sysfs interfaces,
 	  /sys/class/rtc/rtc0 through /sys/.../rtcN.
 	  /sys/class/rtc/rtc0 through /sys/.../rtcN.
@@ -71,7 +68,6 @@ config RTC_INTF_SYSFS
 config RTC_INTF_PROC
 config RTC_INTF_PROC
 	boolean "/proc/driver/rtc (procfs for rtcN)"
 	boolean "/proc/driver/rtc (procfs for rtcN)"
 	depends on PROC_FS
 	depends on PROC_FS
-	default RTC_CLASS
 	help
 	help
 	  Say yes here if you want to use your system clock RTC through
 	  Say yes here if you want to use your system clock RTC through
 	  the proc interface, /proc/driver/rtc.
 	  the proc interface, /proc/driver/rtc.
@@ -83,7 +79,6 @@ config RTC_INTF_PROC
 
 
 config RTC_INTF_DEV
 config RTC_INTF_DEV
 	boolean "/dev/rtcN (character devices)"
 	boolean "/dev/rtcN (character devices)"
-	default RTC_CLASS
 	help
 	help
 	  Say yes here if you want to use your RTCs using the /dev
 	  Say yes here if you want to use your RTCs using the /dev
 	  interfaces, which "udev" sets up as /dev/rtc0 through
 	  interfaces, which "udev" sets up as /dev/rtc0 through
@@ -129,7 +124,7 @@ if I2C
 
 
 config RTC_DRV_88PM860X
 config RTC_DRV_88PM860X
 	tristate "Marvell 88PM860x"
 	tristate "Marvell 88PM860x"
-	depends on RTC_CLASS && I2C && MFD_88PM860X
+	depends on I2C && MFD_88PM860X
 	help
 	help
 	  If you say yes here you get support for RTC function in Marvell
 	  If you say yes here you get support for RTC function in Marvell
 	  88PM860x chips.
 	  88PM860x chips.
@@ -139,7 +134,7 @@ config RTC_DRV_88PM860X
 
 
 config RTC_DRV_88PM80X
 config RTC_DRV_88PM80X
 	tristate "Marvell 88PM80x"
 	tristate "Marvell 88PM80x"
-	depends on RTC_CLASS && I2C && MFD_88PM800
+	depends on I2C && MFD_88PM800
 	help
 	help
 	  If you say yes here you get support for RTC function in Marvell
 	  If you say yes here you get support for RTC function in Marvell
 	  88PM80x chips.
 	  88PM80x chips.
@@ -167,7 +162,7 @@ config RTC_DRV_DS1307
 
 
 config RTC_DRV_DS1374
 config RTC_DRV_DS1374
 	tristate "Dallas/Maxim DS1374"
 	tristate "Dallas/Maxim DS1374"
-	depends on RTC_CLASS && I2C
+	depends on I2C
 	help
 	help
 	  If you say yes here you get support for Dallas Semiconductor
 	  If you say yes here you get support for Dallas Semiconductor
 	  DS1374 real-time clock chips. If an interrupt is associated
 	  DS1374 real-time clock chips. If an interrupt is associated
@@ -187,7 +182,7 @@ config RTC_DRV_DS1672
 
 
 config RTC_DRV_DS3232
 config RTC_DRV_DS3232
 	tristate "Dallas/Maxim DS3232"
 	tristate "Dallas/Maxim DS3232"
-	depends on RTC_CLASS && I2C
+	depends on I2C
 	help
 	help
 	  If you say yes here you get support for Dallas Semiconductor
 	  If you say yes here you get support for Dallas Semiconductor
 	  DS3232 real-time clock chips. If an interrupt is associated
 	  DS3232 real-time clock chips. If an interrupt is associated
@@ -337,7 +332,7 @@ config RTC_DRV_TWL92330
 
 
 config RTC_DRV_TWL4030
 config RTC_DRV_TWL4030
 	tristate "TI TWL4030/TWL5030/TWL6030/TPS659x0"
 	tristate "TI TWL4030/TWL5030/TWL6030/TPS659x0"
-	depends on RTC_CLASS && TWL4030_CORE
+	depends on TWL4030_CORE
 	help
 	help
 	  If you say yes here you get support for the RTC on the
 	  If you say yes here you get support for the RTC on the
 	  TWL4030/TWL5030/TWL6030 family chips, used mostly with OMAP3 platforms.
 	  TWL4030/TWL5030/TWL6030 family chips, used mostly with OMAP3 platforms.
@@ -560,7 +555,6 @@ config RTC_DRV_DS1302
 
 
 config RTC_DRV_DS1511
 config RTC_DRV_DS1511
 	tristate "Dallas DS1511"
 	tristate "Dallas DS1511"
-	depends on RTC_CLASS
 	help
 	help
 	  If you say yes here you get support for the
 	  If you say yes here you get support for the
 	  Dallas DS1511 timekeeping/watchdog chip.
 	  Dallas DS1511 timekeeping/watchdog chip.
@@ -605,7 +599,6 @@ config RTC_DRV_EFI
 
 
 config RTC_DRV_STK17TA8
 config RTC_DRV_STK17TA8
 	tristate "Simtek STK17TA8"
 	tristate "Simtek STK17TA8"
-	depends on RTC_CLASS
 	help
 	help
 	  If you say yes here you get support for the
 	  If you say yes here you get support for the
 	  Simtek STK17TA8 timekeeping chip.
 	  Simtek STK17TA8 timekeeping chip.
@@ -742,7 +735,7 @@ config RTC_DRV_AB8500
 
 
 config RTC_DRV_NUC900
 config RTC_DRV_NUC900
 	tristate "NUC910/NUC920 RTC driver"
 	tristate "NUC910/NUC920 RTC driver"
-	depends on RTC_CLASS && ARCH_W90X900
+	depends on ARCH_W90X900
 	help
 	help
 	  If you say yes here you get support for the RTC subsystem of the
 	  If you say yes here you get support for the RTC subsystem of the
 	  NUC910/NUC920 used in embedded systems.
 	  NUC910/NUC920 used in embedded systems.
@@ -762,7 +755,6 @@ config RTC_DRV_DAVINCI
 config RTC_DRV_IMXDI
 config RTC_DRV_IMXDI
 	tristate "Freescale IMX DryIce Real Time Clock"
 	tristate "Freescale IMX DryIce Real Time Clock"
 	depends on SOC_IMX25
 	depends on SOC_IMX25
-	depends on RTC_CLASS
 	help
 	help
 	   Support for Freescale IMX DryIce RTC
 	   Support for Freescale IMX DryIce RTC
 
 
@@ -822,7 +814,7 @@ config RTC_DRV_SA1100
 
 
 config RTC_DRV_SH
 config RTC_DRV_SH
 	tristate "SuperH On-Chip RTC"
 	tristate "SuperH On-Chip RTC"
-	depends on RTC_CLASS && SUPERH && HAVE_CLK
+	depends on SUPERH && HAVE_CLK
 	help
 	help
 	  Say Y here to enable support for the on-chip RTC found in
 	  Say Y here to enable support for the on-chip RTC found in
 	  most SuperH processors.
 	  most SuperH processors.
@@ -1054,7 +1046,6 @@ config RTC_DRV_MPC5121
 
 
 config RTC_DRV_JZ4740
 config RTC_DRV_JZ4740
 	tristate "Ingenic JZ4740 SoC"
 	tristate "Ingenic JZ4740 SoC"
-	depends on RTC_CLASS
 	depends on MACH_JZ4740
 	depends on MACH_JZ4740
 	help
 	help
 	  If you say yes here you get support for the Ingenic JZ4740 SoC RTC
 	  If you say yes here you get support for the Ingenic JZ4740 SoC RTC
@@ -1084,7 +1075,7 @@ config RTC_DRV_PM8XXX
 
 
 config RTC_DRV_TEGRA
 config RTC_DRV_TEGRA
 	tristate "NVIDIA Tegra Internal RTC driver"
 	tristate "NVIDIA Tegra Internal RTC driver"
-	depends on RTC_CLASS && ARCH_TEGRA
+	depends on ARCH_TEGRA
 	help
 	help
 	  If you say yes here you get support for the
 	  If you say yes here you get support for the
 	  Tegra 200 series internal RTC module.
 	  Tegra 200 series internal RTC module.
@@ -1121,7 +1112,6 @@ config RTC_DRV_LOONGSON1
 config RTC_DRV_MXC
 config RTC_DRV_MXC
 	tristate "Freescale MXC Real Time Clock"
 	tristate "Freescale MXC Real Time Clock"
 	depends on ARCH_MXC
 	depends on ARCH_MXC
-	depends on RTC_CLASS
 	help
 	help
 	   If you say yes here you get support for the Freescale MXC
 	   If you say yes here you get support for the Freescale MXC
 	   RTC module.
 	   RTC module.