|
@@ -222,10 +222,6 @@ static void puv3_rtc_enable(struct device *dev, int en)
|
|
|
|
|
|
static int puv3_rtc_remove(struct platform_device *dev)
|
|
static int puv3_rtc_remove(struct platform_device *dev)
|
|
{
|
|
{
|
|
- struct rtc_device *rtc = platform_get_drvdata(dev);
|
|
|
|
-
|
|
|
|
- rtc_device_unregister(rtc);
|
|
|
|
-
|
|
|
|
puv3_rtc_setpie(&dev->dev, 0);
|
|
puv3_rtc_setpie(&dev->dev, 0);
|
|
puv3_rtc_setaie(&dev->dev, 0);
|
|
puv3_rtc_setaie(&dev->dev, 0);
|
|
|
|
|
|
@@ -259,6 +255,10 @@ static int puv3_rtc_probe(struct platform_device *pdev)
|
|
dev_dbg(&pdev->dev, "PKUnity_rtc: tick irq %d, alarm irq %d\n",
|
|
dev_dbg(&pdev->dev, "PKUnity_rtc: tick irq %d, alarm irq %d\n",
|
|
puv3_rtc_tickno, puv3_rtc_alarmno);
|
|
puv3_rtc_tickno, puv3_rtc_alarmno);
|
|
|
|
|
|
|
|
+ rtc = devm_rtc_allocate_device(&pdev->dev);
|
|
|
|
+ if (IS_ERR(rtc))
|
|
|
|
+ return PTR_ERR(rtc);
|
|
|
|
+
|
|
/* get the memory region */
|
|
/* get the memory region */
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (res == NULL) {
|
|
if (res == NULL) {
|
|
@@ -278,12 +278,10 @@ static int puv3_rtc_probe(struct platform_device *pdev)
|
|
puv3_rtc_enable(&pdev->dev, 1);
|
|
puv3_rtc_enable(&pdev->dev, 1);
|
|
|
|
|
|
/* register RTC and exit */
|
|
/* register RTC and exit */
|
|
- rtc = rtc_device_register("pkunity", &pdev->dev, &puv3_rtcops,
|
|
|
|
- THIS_MODULE);
|
|
|
|
-
|
|
|
|
- if (IS_ERR(rtc)) {
|
|
|
|
|
|
+ rtc->ops = &puv3_rtcops;
|
|
|
|
+ ret = rtc_register_device(rtc);
|
|
|
|
+ if (ret) {
|
|
dev_err(&pdev->dev, "cannot attach rtc\n");
|
|
dev_err(&pdev->dev, "cannot attach rtc\n");
|
|
- ret = PTR_ERR(rtc);
|
|
|
|
goto err_nortc;
|
|
goto err_nortc;
|
|
}
|
|
}
|
|
|
|
|