[PATCH 39/59] rtc: wm8350: stop using deprecated RTC API

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

drivers/rtc/rtc-wm8350.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/rtc/rtc-wm8350.c b/drivers/rtc/rtc-wm8350.c
index 2018614f258f..140efe601c88 100644
--- a/drivers/rtc/rtc-wm8350.c
+++ b/drivers/rtc/rtc-wm8350.c
@@ -424,13 +424,11 @@ static int wm8350_rtc_probe(struct platform_device *pdev)

device_init_wakeup(&pdev->dev, 1);

- wm_rtc->rtc = devm_rtc_device_register(&pdev->dev, "wm8350",
- &wm8350_rtc_ops, THIS_MODULE);
- if (IS_ERR(wm_rtc->rtc)) {
- ret = PTR_ERR(wm_rtc->rtc);
- dev_err(&pdev->dev, "failed to register RTC: %d\n", ret);
- return ret;
- }
+ wm_rtc->rtc = devm_rtc_allocate_device(&pdev->dev);
+ if (IS_ERR(wm_rtc->rtc))
+ return PTR_ERR(wm_rtc->rtc);
+
+ wm_rtc->rtc->ops = &wm8350_rtc_ops;

wm8350_register_irq(wm8350, WM8350_IRQ_RTC_SEC,
wm8350_rtc_update_handler, 0,
@@ -441,7 +439,7 @@ static int wm8350_rtc_probe(struct platform_device *pdev)
wm8350_rtc_alarm_handler, 0,
"RTC Alarm", wm8350);

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

static int wm8350_rtc_remove(struct platform_device *pdev)
--
2.29.1