|
@@ -439,8 +439,8 @@ static int wm8350_rtc_probe(struct platform_device *pdev)
|
|
|
|
|
|
device_init_wakeup(&pdev->dev, 1);
|
|
|
|
|
|
- wm_rtc->rtc = rtc_device_register("wm8350", &pdev->dev,
|
|
|
- &wm8350_rtc_ops, THIS_MODULE);
|
|
|
+ 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);
|
|
@@ -462,13 +462,10 @@ static int wm8350_rtc_probe(struct platform_device *pdev)
|
|
|
static int wm8350_rtc_remove(struct platform_device *pdev)
|
|
|
{
|
|
|
struct wm8350 *wm8350 = platform_get_drvdata(pdev);
|
|
|
- struct wm8350_rtc *wm_rtc = &wm8350->rtc;
|
|
|
|
|
|
wm8350_free_irq(wm8350, WM8350_IRQ_RTC_SEC, wm8350);
|
|
|
wm8350_free_irq(wm8350, WM8350_IRQ_RTC_ALM, wm8350);
|
|
|
|
|
|
- rtc_device_unregister(wm_rtc->rtc);
|
|
|
-
|
|
|
return 0;
|
|
|
}
|
|
|
|