UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtc: rtc-at91sam9: 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:
Jingoo Han 2013-04-29 16:20:35 -07:00 committed by Linus Torvalds
parent fa11f7e777
commit 9d42e46510
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/rtc/rtc-at91sam9.c
View File

@ -20,6 +20,7 @@
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/platform_data/atmel.h> #include <linux/platform_data/atmel.h>
#include <linux/io.h>
#include <mach/at91_rtt.h> #include <mach/at91_rtt.h>
#include <mach/cpu.h> #include <mach/cpu.h>
@ -309,7 +310,7 @@ static int at91_rtc_probe(struct platform_device *pdev)
return irq; return irq;
} }
rtc = kzalloc(sizeof *rtc, GFP_KERNEL); rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
if (!rtc) if (!rtc)
return -ENOMEM; return -ENOMEM;
@ -320,18 +321,19 @@ static int at91_rtc_probe(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, 1); device_init_wakeup(&pdev->dev, 1);
platform_set_drvdata(pdev, rtc); platform_set_drvdata(pdev, rtc);
rtc->rtt = ioremap(r->start, resource_size(r)); rtc->rtt = devm_ioremap(&pdev->dev, r->start, resource_size(r));
if (!rtc->rtt) { if (!rtc->rtt) {
dev_err(&pdev->dev, "failed to map registers, aborting.\n"); dev_err(&pdev->dev, "failed to map registers, aborting.\n");
ret = -ENOMEM; ret = -ENOMEM;
goto fail; goto fail;
} }
rtc->gpbr = ioremap(r_gpbr->start, resource_size(r_gpbr)); rtc->gpbr = devm_ioremap(&pdev->dev, r_gpbr->start,
resource_size(r_gpbr));
if (!rtc->gpbr) { if (!rtc->gpbr) {
dev_err(&pdev->dev, "failed to map gpbr registers, aborting.\n"); dev_err(&pdev->dev, "failed to map gpbr registers, aborting.\n");
ret = -ENOMEM; ret = -ENOMEM;
goto fail_gpbr; goto fail;
} }
mr = rtt_readl(rtc, MR); mr = rtt_readl(rtc, MR);
@ -346,20 +348,19 @@ static int at91_rtc_probe(struct platform_device *pdev)
mr &= ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN); mr &= ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN);
rtt_writel(rtc, MR, mr); rtt_writel(rtc, MR, mr);
rtc->rtcdev = rtc_device_register(pdev->name, &pdev->dev, rtc->rtcdev = devm_rtc_device_register(&pdev->dev, pdev->name,
&at91_rtc_ops, THIS_MODULE); &at91_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtcdev)) { if (IS_ERR(rtc->rtcdev)) {
ret = PTR_ERR(rtc->rtcdev); ret = PTR_ERR(rtc->rtcdev);
goto fail_register; goto fail;
} }
/* register irq handler after we know what name we'll use */ /* register irq handler after we know what name we'll use */
ret = request_irq(rtc->irq, at91_rtc_interrupt, IRQF_SHARED, ret = devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt,
dev_name(&rtc->rtcdev->dev), rtc); IRQF_SHARED, dev_name(&rtc->rtcdev->dev), rtc);
if (ret) { if (ret) {
dev_dbg(&pdev->dev, "can't share IRQ %d?\n", rtc->irq); dev_dbg(&pdev->dev, "can't share IRQ %d?\n", rtc->irq);
rtc_device_unregister(rtc->rtcdev); goto fail;
goto fail_register;
} }
/* NOTE: sam9260 rev A silicon has a ROM bug which resets the /* NOTE: sam9260 rev A silicon has a ROM bug which resets the
@ -374,13 +375,8 @@ static int at91_rtc_probe(struct platform_device *pdev)
return 0; return 0;
fail_register:
iounmap(rtc->gpbr);
fail_gpbr:
iounmap(rtc->rtt);
fail: fail:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(rtc);
return ret; return ret;
} }
@ -394,14 +390,8 @@ static int at91_rtc_remove(struct platform_device *pdev)
/* disable all interrupts */ /* disable all interrupts */
rtt_writel(rtc, MR, mr & ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN)); rtt_writel(rtc, MR, mr & ~(AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN));
free_irq(rtc->irq, rtc);
rtc_device_unregister(rtc->rtcdev);
iounmap(rtc->gpbr);
iounmap(rtc->rtt);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(rtc);
return 0; return 0;
} }