[PATCH 31/59] rtc: mcp795: stop using deprecated RTC API

Bartosz Golaszewski
2020-11-19T11:45:56Z

drivers/rtc/rtc-mcp795.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-mcp795.c b/drivers/rtc/rtc-mcp795.c
index 21cbf7f892e8..04dfd1d0f9ca 100644
--- a/drivers/rtc/rtc-mcp795.c
+++ b/drivers/rtc/rtc-mcp795.c
@@ -396,11 +396,11 @@ static int mcp795_probe(struct spi_device *spi)
/* Clear the 12 hour mode flag*/
mcp795_rtcc_set_bits(&spi->dev, 0x03, MCP795_24_BIT, 0);

- rtc = devm_rtc_device_register(&spi->dev, "rtc-mcp795",
- &mcp795_rtc_ops, THIS_MODULE);
+ rtc = devm_rtc_allocate_device(&spi->dev);
if (IS_ERR(rtc))
return PTR_ERR(rtc);

+ rtc->ops = &mcp795_rtc_ops;
spi_set_drvdata(spi, rtc);

if (spi->irq > 0) {
@@ -420,7 +420,8 @@ static int mcp795_probe(struct spi_device *spi)
else
device_init_wakeup(&spi->dev, true);
}
- return 0;
+
+ return devm_rtc_register_device(rtc);
}

#ifdef CONFIG_OF
--
2.29.1