[PATCH] rtc-cmos: don't refer to asm-generic/rtc.h

From: Christoph Hellwig
Date: Wed Oct 12 2016 - 09:33:16 EST


That header has been gone for a while. I've fixed up the Kconfig
comment, but the one in rtc-cmos.c doesn't make any sense to me
even looking at its history.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
drivers/rtc/Kconfig | 4 ++--
drivers/rtc/rtc-cmos.c | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index d1e0807..9bc1b4d 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -815,8 +815,8 @@ config RTC_DRV_RV3029_HWMON

comment "Platform RTC drivers"

-# this 'CMOS' RTC driver is arch dependent because <asm-generic/rtc.h>
-# requires <asm/mc146818rtc.h> defining CMOS_READ/CMOS_WRITE, and a
+# this 'CMOS' RTC driver is arch dependent because it requires
+# <asm/mc146818rtc.h> defining CMOS_READ/CMOS_WRITE, and a
# global rtc_lock ... it's not yet just another platform_device.

config RTC_DRV_CMOS
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 43745ca..a2b12eb 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -698,9 +698,6 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)

spin_unlock_irq(&rtc_lock);

- /* FIXME:
- * <asm-generic/rtc.h> doesn't know 12-hour mode either.
- */
if (is_valid_irq(rtc_irq) && !(rtc_control & RTC_24H)) {
dev_warn(dev, "only 24-hr supported\n");
retval = -ENXIO;
--
2.10.1.382.ga23ca1b