From 28abbba36a5a9f35bfaa75bf8ee0ebf2fe40b9e3 Mon Sep 17 00:00:00 2001 From: Bruno Thomsen Date: Tue, 27 Aug 2019 16:36:56 +0200 Subject: [PATCH] rtc: pcf2127: bugfix: watchdog build dependency Disable watchdog registation when kernel is build without watchdog functionality, and enable watchdog core otherwise. This removes compile errors like the one below: drivers/rtc/rtc-pcf2127.o: in function `pcf2127_probe.constprop.3': rtc-pcf2127.c:(.text.unlikely+0x2c8): undefined reference to `devm_watchdog_register_device' Watchdog feature in chip will always be configured as this is safe to do in both cases and minimize code churn. Reported-by: Hulk Robot Reported-by: YueHaibing Fixes: bbc597561ce1 ("rtc: pcf2127: add watchdog feature support") Signed-off-by: Bruno Thomsen Link: https://lore.kernel.org/r/20190827143656.4734-1-bruno.thomsen@gmail.com Signed-off-by: Alexandre Belloni --- drivers/rtc/Kconfig | 1 + drivers/rtc/rtc-pcf2127.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 758f7a417470..da0aceb45095 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -886,6 +886,7 @@ config RTC_DRV_DS3232_HWMON config RTC_DRV_PCF2127 tristate "NXP PCF2127" depends on RTC_I2C_AND_SPI + select WATCHDOG_CORE if WATCHDOG help If you say yes here you get support for the NXP PCF2127/29 RTC chips with integrated quartz crystal for industrial applications. diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c index 3ec87d320766..02b069caffd5 100644 --- a/drivers/rtc/rtc-pcf2127.c +++ b/drivers/rtc/rtc-pcf2127.c @@ -475,9 +475,11 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap, return ret; } +#ifdef CONFIG_WATCHDOG ret = devm_watchdog_register_device(dev, &pcf2127->wdd); if (ret) return ret; +#endif /* CONFIG_WATCHDOG */ /* * Disable battery low/switch-over timestamp and interrupts.