Commit b7aff107 authored by Alexandre Belloni's avatar Alexandre Belloni

rtc: pl031: switch to devm_rtc_allocate_device/rtc_register_device

Switch to devm_rtc_allocate_device to simplify the erro and driver removal
paths.
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent c778ec85
...@@ -310,7 +310,6 @@ static int pl031_remove(struct amba_device *adev) ...@@ -310,7 +310,6 @@ static int pl031_remove(struct amba_device *adev)
device_init_wakeup(&adev->dev, false); device_init_wakeup(&adev->dev, false);
if (adev->irq[0]) if (adev->irq[0])
free_irq(adev->irq[0], ldata); free_irq(adev->irq[0], ldata);
rtc_device_unregister(ldata->rtc);
amba_release_regions(adev); amba_release_regions(adev);
return 0; return 0;
...@@ -383,24 +382,25 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) ...@@ -383,24 +382,25 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
} }
device_init_wakeup(&adev->dev, true); device_init_wakeup(&adev->dev, true);
ldata->rtc = rtc_device_register("pl031", &adev->dev, ops, ldata->rtc = devm_rtc_allocate_device(&adev->dev);
THIS_MODULE); if (IS_ERR(ldata->rtc))
if (IS_ERR(ldata->rtc)) { return PTR_ERR(ldata->rtc);
ret = PTR_ERR(ldata->rtc);
ldata->rtc->ops = ops;
ret = rtc_register_device(ldata->rtc);
if (ret)
goto out; goto out;
}
if (adev->irq[0]) { if (adev->irq[0]) {
ret = request_irq(adev->irq[0], pl031_interrupt, ret = request_irq(adev->irq[0], pl031_interrupt,
vendor->irqflags, "rtc-pl031", ldata); vendor->irqflags, "rtc-pl031", ldata);
if (ret) if (ret)
goto out_no_irq; goto out;
dev_pm_set_wake_irq(&adev->dev, adev->irq[0]); dev_pm_set_wake_irq(&adev->dev, adev->irq[0]);
} }
return 0; return 0;
out_no_irq:
rtc_device_unregister(ldata->rtc);
out: out:
amba_release_regions(adev); amba_release_regions(adev);
err_req: err_req:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment