evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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-07-03 15:07:07 -07:00 • committed by Linus Torvalds
parent c08ac4894c
commit 073bf42460
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/rtc/rtc-mpc5121.c
View file

@ -312,15 +312,14 @@ static int mpc5121_rtc_probe(struct platform_device *op)
struct mpc5121_rtc_data *rtc; struct mpc5121_rtc_data *rtc;
int err = 0; int err = 0;
rtc = kzalloc(sizeof(*rtc), GFP_KERNEL); rtc = devm_kzalloc(&op->dev, sizeof(*rtc), GFP_KERNEL);
if (!rtc) if (!rtc)
return -ENOMEM; return -ENOMEM;
rtc->regs = of_iomap(op->dev.of_node, 0); rtc->regs = of_iomap(op->dev.of_node, 0);
if (!rtc->regs) { if (!rtc->regs) {
dev_err(&op->dev, "%s: couldn't map io space\n", __func__); dev_err(&op->dev, "%s: couldn't map io space\n", __func__);
err = -ENOSYS; return -ENOSYS;
goto out_free;
} }
device_init_wakeup(&op->dev, 1); device_init_wakeup(&op->dev, 1);
@ -354,10 +353,10 @@ static int mpc5121_rtc_probe(struct platform_device *op)
out_be32(&rtc->regs->keep_alive, ka); out_be32(&rtc->regs->keep_alive, ka);
} }
rtc->rtc = rtc_device_register("mpc5121-rtc", &op->dev, rtc->rtc = devm_rtc_device_register(&op->dev, "mpc5121-rtc",
&mpc5121_rtc_ops, THIS_MODULE); &mpc5121_rtc_ops, THIS_MODULE);
} else { } else {
rtc->rtc = rtc_device_register("mpc5200-rtc", &op->dev, rtc->rtc = devm_rtc_device_register(&op->dev, "mpc5200-rtc",
&mpc5200_rtc_ops, THIS_MODULE); &mpc5200_rtc_ops, THIS_MODULE);
} }
@ -377,8 +376,6 @@ out_dispose2:
out_dispose: out_dispose:
irq_dispose_mapping(rtc->irq); irq_dispose_mapping(rtc->irq);
iounmap(rtc->regs); iounmap(rtc->regs);
out_free:
kfree(rtc);
return err; return err;
} }
@ -392,14 +389,11 @@ static int mpc5121_rtc_remove(struct platform_device *op)
out_8(&regs->alm_enable, 0); out_8(&regs->alm_enable, 0);
out_8(&regs->int_enable, in_8(&regs->int_enable) & ~0x1); out_8(&regs->int_enable, in_8(&regs->int_enable) & ~0x1);
rtc_device_unregister(rtc->rtc);
iounmap(rtc->regs); iounmap(rtc->regs);
free_irq(rtc->irq, &op->dev); free_irq(rtc->irq, &op->dev);
free_irq(rtc->irq_periodic, &op->dev); free_irq(rtc->irq_periodic, &op->dev);
irq_dispose_mapping(rtc->irq); irq_dispose_mapping(rtc->irq);
irq_dispose_mapping(rtc->irq_periodic); irq_dispose_mapping(rtc->irq_periodic);
dev_set_drvdata(&op->dev, NULL);
kfree(rtc);
return 0; return 0;
} }