Skip to content

Commit

Permalink
rtc: spear: switch to devm_rtc_allocate_device
Browse files Browse the repository at this point in the history
Switch to devm_rtc_allocate_device/devm_rtc_register_device, this allows
for further improvement of the driver.

Signed-off-by: Alexandre Belloni <[email protected]>
Acked-by: Viresh Kumar <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
  • Loading branch information
alexandrebelloni committed Mar 23, 2022
1 parent d28a0e1 commit 4fc4d33
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/rtc/rtc-spear.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,10 @@ static int spear_rtc_probe(struct platform_device *pdev)
if (!config)
return -ENOMEM;

config->rtc = devm_rtc_allocate_device(&pdev->dev);
if (IS_ERR(config->rtc))
return PTR_ERR(config->rtc);

/* alarm irqs */
irq = platform_get_irq(pdev, 0);
if (irq < 0)
Expand Down Expand Up @@ -380,17 +384,13 @@ static int spear_rtc_probe(struct platform_device *pdev)
spin_lock_init(&config->lock);
platform_set_drvdata(pdev, config);

config->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
&spear_rtc_ops, THIS_MODULE);
if (IS_ERR(config->rtc)) {
dev_err(&pdev->dev, "can't register RTC device, err %ld\n",
PTR_ERR(config->rtc));
status = PTR_ERR(config->rtc);
goto err_disable_clock;
}

config->rtc->ops = &spear_rtc_ops;
config->rtc->uie_unsupported = 1;

status = devm_rtc_register_device(config->rtc);
if (status)
goto err_disable_clock;

if (!device_can_wakeup(&pdev->dev))
device_init_wakeup(&pdev->dev, 1);

Expand Down

0 comments on commit 4fc4d33

Please sign in to comment.