|
@@ -276,14 +276,15 @@ static int tps6586x_rtc_probe(struct platform_device *pdev)
|
|
|
device_init_wakeup(&pdev->dev, 1);
|
|
|
|
|
|
platform_set_drvdata(pdev, rtc);
|
|
|
- rtc->rtc = devm_rtc_device_register(&pdev->dev, dev_name(&pdev->dev),
|
|
|
- &tps6586x_rtc_ops, THIS_MODULE);
|
|
|
+ rtc->rtc = devm_rtc_allocate_device(&pdev->dev);
|
|
|
if (IS_ERR(rtc->rtc)) {
|
|
|
ret = PTR_ERR(rtc->rtc);
|
|
|
- dev_err(&pdev->dev, "RTC device register: ret %d\n", ret);
|
|
|
+ dev_err(&pdev->dev, "RTC allocate device: ret %d\n", ret);
|
|
|
goto fail_rtc_register;
|
|
|
}
|
|
|
|
|
|
+ rtc->rtc->ops = &tps6586x_rtc_ops;
|
|
|
+
|
|
|
ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL,
|
|
|
tps6586x_rtc_irq,
|
|
|
IRQF_ONESHOT,
|
|
@@ -294,6 +295,13 @@ static int tps6586x_rtc_probe(struct platform_device *pdev)
|
|
|
goto fail_rtc_register;
|
|
|
}
|
|
|
disable_irq(rtc->irq);
|
|
|
+
|
|
|
+ ret = rtc_register_device(rtc->rtc);
|
|
|
+ if (ret) {
|
|
|
+ dev_err(&pdev->dev, "RTC device register: ret %d\n", ret);
|
|
|
+ goto fail_rtc_register;
|
|
|
+ }
|
|
|
+
|
|
|
return 0;
|
|
|
|
|
|
fail_rtc_register:
|