Commit 76753caf authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds

rtc: rtc-pcf50633: use devm_*() functions

Use devm_*() functions to make cleanup paths simpler.
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dd48ccc4
...@@ -252,20 +252,17 @@ static int pcf50633_rtc_probe(struct platform_device *pdev) ...@@ -252,20 +252,17 @@ static int pcf50633_rtc_probe(struct platform_device *pdev)
{ {
struct pcf50633_rtc *rtc; struct pcf50633_rtc *rtc;
rtc = kzalloc(sizeof(*rtc), GFP_KERNEL); rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
if (!rtc) if (!rtc)
return -ENOMEM; return -ENOMEM;
rtc->pcf = dev_to_pcf50633(pdev->dev.parent); rtc->pcf = dev_to_pcf50633(pdev->dev.parent);
platform_set_drvdata(pdev, rtc); platform_set_drvdata(pdev, rtc);
rtc->rtc_dev = rtc_device_register("pcf50633-rtc", &pdev->dev, rtc->rtc_dev = devm_rtc_device_register(&pdev->dev, "pcf50633-rtc",
&pcf50633_rtc_ops, THIS_MODULE); &pcf50633_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtc_dev)) { if (IS_ERR(rtc->rtc_dev))
int ret = PTR_ERR(rtc->rtc_dev); return PTR_ERR(rtc->rtc_dev);
kfree(rtc);
return ret;
}
pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_ALARM, pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_ALARM,
pcf50633_rtc_irq, rtc); pcf50633_rtc_irq, rtc);
...@@ -277,12 +274,8 @@ static int pcf50633_rtc_remove(struct platform_device *pdev) ...@@ -277,12 +274,8 @@ static int pcf50633_rtc_remove(struct platform_device *pdev)
struct pcf50633_rtc *rtc; struct pcf50633_rtc *rtc;
rtc = platform_get_drvdata(pdev); rtc = platform_get_drvdata(pdev);
pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_ALARM); pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_ALARM);
rtc_device_unregister(rtc->rtc_dev);
kfree(rtc);
return 0; return 0;
} }
......
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