diff options
| author | Bruno Thomsen <bruno.thomsen@gmail.com> | 2019-08-27 16:36:56 +0200 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2019-08-27 18:24:15 +0200 |
| commit | 28abbba36a5a9f35bfaa75bf8ee0ebf2fe40b9e3 (patch) | |
| tree | bbbb8e4579f523e72e94d0525d55cfdb394b1544 /drivers/rtc/rtc-pcf2127.c | |
| parent | rtc: pcf2127: add tamper detection support (diff) | |
| download | linux-28abbba36a5a9f35bfaa75bf8ee0ebf2fe40b9e3.tar.xz linux-28abbba36a5a9f35bfaa75bf8ee0ebf2fe40b9e3.zip | |
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 <hulkci@huawei.com>
Reported-by: YueHaibing <yuehaibing@huawei.com>
Fixes: bbc597561ce1 ("rtc: pcf2127: add watchdog feature support")
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
Link: https://lore.kernel.org/r/20190827143656.4734-1-bruno.thomsen@gmail.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'drivers/rtc/rtc-pcf2127.c')
| -rw-r--r-- | drivers/rtc/rtc-pcf2127.c | 2 |
1 files changed, 2 insertions, 0 deletions
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. |