kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rtc: rtc-bfin: 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-04-29 16:20:35 -07:00 committed by Linus Torvalds
parent 9d42e46510
commit 87e7d520ed
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/rtc/rtc-bfin.c
View file

@ -352,14 +352,14 @@ static int bfin_rtc_probe(struct platform_device *pdev)
dev_dbg_stamp(dev); dev_dbg_stamp(dev);
/* Allocate memory for our RTC struct */ /* Allocate memory for our RTC struct */
rtc = kzalloc(sizeof(*rtc), GFP_KERNEL); rtc = devm_kzalloc(dev, sizeof(*rtc), GFP_KERNEL);
if (unlikely(!rtc)) if (unlikely(!rtc))
return -ENOMEM; return -ENOMEM;
platform_set_drvdata(pdev, rtc); platform_set_drvdata(pdev, rtc);
device_init_wakeup(dev, 1); device_init_wakeup(dev, 1);
/* Register our RTC with the RTC framework */ /* Register our RTC with the RTC framework */
rtc->rtc_dev = rtc_device_register(pdev->name, dev, &bfin_rtc_ops, rtc->rtc_dev = devm_rtc_device_register(dev, pdev->name, &bfin_rtc_ops,
THIS_MODULE); THIS_MODULE);
if (unlikely(IS_ERR(rtc->rtc_dev))) { if (unlikely(IS_ERR(rtc->rtc_dev))) {
ret = PTR_ERR(rtc->rtc_dev); ret = PTR_ERR(rtc->rtc_dev);
@ -367,9 +367,10 @@ static int bfin_rtc_probe(struct platform_device *pdev)
} }
/* Grab the IRQ and init the hardware */ /* Grab the IRQ and init the hardware */
ret = request_irq(IRQ_RTC, bfin_rtc_interrupt, 0, pdev->name, dev); ret = devm_request_irq(dev, IRQ_RTC, bfin_rtc_interrupt, 0,
pdev->name, dev);
if (unlikely(ret)) if (unlikely(ret))
goto err_reg; goto err;
/* sometimes the bootloader touched things, but the write complete was not /* sometimes the bootloader touched things, but the write complete was not
* enabled, so let's just do a quick timeout here since the IRQ will not fire ... * enabled, so let's just do a quick timeout here since the IRQ will not fire ...
*/ */
@ -381,23 +382,16 @@ static int bfin_rtc_probe(struct platform_device *pdev)
return 0; return 0;
err_reg:
rtc_device_unregister(rtc->rtc_dev);
err: err:
kfree(rtc);
return ret; return ret;
} }
static int bfin_rtc_remove(struct platform_device *pdev) static int bfin_rtc_remove(struct platform_device *pdev)
{ {
struct bfin_rtc *rtc = platform_get_drvdata(pdev);
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
bfin_rtc_reset(dev, 0); bfin_rtc_reset(dev, 0);
free_irq(IRQ_RTC, dev);
rtc_device_unregister(rtc->rtc_dev);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
kfree(rtc);
return 0; return 0;
} }