[PATCH 16/59] rtc: pxa: stop using deprecated RTC API

From: Bartosz Golaszewski
Date: Thu Nov 19 2020 - 06:47:35 EST


From: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx>

devm_rtc_device_register() is deprecated. Use devm_rtc_allocate_device()
and devm_rtc_register_device() pair instead.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx>
---
drivers/rtc/rtc-pxa.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c
index d2f1d8f754bf..56d22576ae0e 100644
--- a/drivers/rtc/rtc-pxa.c
+++ b/drivers/rtc/rtc-pxa.c
@@ -351,17 +351,14 @@ static int __init pxa_rtc_probe(struct platform_device *pdev)

rtsr_clear_bits(pxa_rtc, RTSR_PIALE | RTSR_RDALE1 | RTSR_HZE);

- pxa_rtc->rtc = devm_rtc_device_register(&pdev->dev, "pxa-rtc",
- &pxa_rtc_ops, THIS_MODULE);
- if (IS_ERR(pxa_rtc->rtc)) {
- ret = PTR_ERR(pxa_rtc->rtc);
- dev_err(dev, "Failed to register RTC device -> %d\n", ret);
- return ret;
- }
+ pxa_rtc->rtc = devm_rtc_allocate_device(&pdev->dev);
+ if (IS_ERR(pxa_rtc->rtc))
+ return PTR_ERR(pxa_rtc->rtc);

+ pxa_rtc->rtc->ops = &pxa_rtc_ops;
device_init_wakeup(dev, 1);

- return 0;
+ return devm_rtc_register_device(pxa_rtc->rtc);
}

static int __exit pxa_rtc_remove(struct platform_device *pdev)
--
2.29.1