Commit 6bbad585 authored by Alexandre Belloni's avatar Alexandre Belloni

rtc: lpc32xx: convert to devm_rtc_allocate_device

This allows further improvement of the driver.
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent fbc5ee9a
...@@ -47,8 +47,6 @@ ...@@ -47,8 +47,6 @@
#define LPC32XX_RTC_KEY_ONSW_LOADVAL 0xB5C13F27 #define LPC32XX_RTC_KEY_ONSW_LOADVAL 0xB5C13F27
#define RTC_NAME "rtc-lpc32xx"
#define rtc_readl(dev, reg) \ #define rtc_readl(dev, reg) \
__raw_readl((dev)->rtc_base + (reg)) __raw_readl((dev)->rtc_base + (reg))
#define rtc_writel(dev, reg, val) \ #define rtc_writel(dev, reg, val) \
...@@ -201,7 +199,7 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev) ...@@ -201,7 +199,7 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct lpc32xx_rtc *rtc; struct lpc32xx_rtc *rtc;
int rtcirq; int rtcirq, err;
u32 tmp; u32 tmp;
rtcirq = platform_get_irq(pdev, 0); rtcirq = platform_get_irq(pdev, 0);
...@@ -256,12 +254,15 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev) ...@@ -256,12 +254,15 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, rtc); platform_set_drvdata(pdev, rtc);
rtc->rtc = devm_rtc_device_register(&pdev->dev, RTC_NAME, rtc->rtc = devm_rtc_allocate_device(&pdev->dev);
&lpc32xx_rtc_ops, THIS_MODULE); if (IS_ERR(rtc->rtc))
if (IS_ERR(rtc->rtc)) {
dev_err(&pdev->dev, "Can't get RTC\n");
return PTR_ERR(rtc->rtc); return PTR_ERR(rtc->rtc);
}
rtc->rtc->ops = &lpc32xx_rtc_ops;
err = rtc_register_device(rtc->rtc);
if (err)
return err;
/* /*
* IRQ is enabled after device registration in case alarm IRQ * IRQ is enabled after device registration in case alarm IRQ
...@@ -374,7 +375,7 @@ static struct platform_driver lpc32xx_rtc_driver = { ...@@ -374,7 +375,7 @@ static struct platform_driver lpc32xx_rtc_driver = {
.probe = lpc32xx_rtc_probe, .probe = lpc32xx_rtc_probe,
.remove = lpc32xx_rtc_remove, .remove = lpc32xx_rtc_remove,
.driver = { .driver = {
.name = RTC_NAME, .name = "rtc-lpc32xx",
.pm = LPC32XX_RTC_PM_OPS, .pm = LPC32XX_RTC_PM_OPS,
.of_match_table = of_match_ptr(lpc32xx_rtc_match), .of_match_table = of_match_ptr(lpc32xx_rtc_match),
}, },
......
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