mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-24 17:23:25 -05:00
rtc: rtc-ab8500: use devm_*() functions
Use devm_*() functions to make cleanup paths simpler. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
e035be6a55
commit
fa11f7e777
1 changed files with 6 additions and 12 deletions
|
@ -422,20 +422,19 @@ static int ab8500_rtc_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
device_init_wakeup(&pdev->dev, true);
|
device_init_wakeup(&pdev->dev, true);
|
||||||
|
|
||||||
rtc = rtc_device_register("ab8500-rtc", &pdev->dev, &ab8500_rtc_ops,
|
rtc = devm_rtc_device_register(&pdev->dev, "ab8500-rtc",
|
||||||
THIS_MODULE);
|
&ab8500_rtc_ops, THIS_MODULE);
|
||||||
if (IS_ERR(rtc)) {
|
if (IS_ERR(rtc)) {
|
||||||
dev_err(&pdev->dev, "Registration failed\n");
|
dev_err(&pdev->dev, "Registration failed\n");
|
||||||
err = PTR_ERR(rtc);
|
err = PTR_ERR(rtc);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = request_threaded_irq(irq, NULL, rtc_alarm_handler,
|
err = devm_request_threaded_irq(&pdev->dev, irq, NULL,
|
||||||
IRQF_NO_SUSPEND | IRQF_ONESHOT, "ab8500-rtc", rtc);
|
rtc_alarm_handler, IRQF_NO_SUSPEND | IRQF_ONESHOT,
|
||||||
if (err < 0) {
|
"ab8500-rtc", rtc);
|
||||||
rtc_device_unregister(rtc);
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
}
|
|
||||||
|
|
||||||
platform_set_drvdata(pdev, rtc);
|
platform_set_drvdata(pdev, rtc);
|
||||||
|
|
||||||
|
@ -450,13 +449,8 @@ static int ab8500_rtc_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
static int ab8500_rtc_remove(struct platform_device *pdev)
|
static int ab8500_rtc_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct rtc_device *rtc = platform_get_drvdata(pdev);
|
|
||||||
int irq = platform_get_irq_byname(pdev, "ALARM");
|
|
||||||
|
|
||||||
ab8500_sysfs_rtc_unregister(&pdev->dev);
|
ab8500_sysfs_rtc_unregister(&pdev->dev);
|
||||||
|
|
||||||
free_irq(irq, rtc);
|
|
||||||
rtc_device_unregister(rtc);
|
|
||||||
platform_set_drvdata(pdev, NULL);
|
platform_set_drvdata(pdev, NULL);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Add table
Reference in a new issue