[PATCH 29/59] rtc: twl: stop using deprecated RTC API

Bartosz Golaszewski
2020-11-19T11:46:25Z

drivers/rtc/rtc-twl.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
index c24d1e18f56c..5caf8900b6cd 100644
--- a/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@ -562,13 +562,11 @@ static int twl_rtc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, twl_rtc);
device_init_wakeup(&pdev->dev, 1);

- twl_rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
- &twl_rtc_ops, THIS_MODULE);
- if (IS_ERR(twl_rtc->rtc)) {
- dev_err(&pdev->dev, "can't register RTC device, err %ld\n",
- PTR_ERR(twl_rtc->rtc));
+ twl_rtc->rtc = devm_rtc_allocate_device(&pdev->dev);
+ if (IS_ERR(twl_rtc->rtc))
return PTR_ERR(twl_rtc->rtc);
- }
+
+ twl_rtc->rtc->ops = &twl_rtc_ops;

ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
twl_rtc_interrupt,
@@ -579,7 +577,7 @@ static int twl_rtc_probe(struct platform_device *pdev)
return ret;
}

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

/*
--
2.29.1