Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rtc: rtc-ds1286: 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:38 -07:00 committed by Linus Torvalds
parent 15c1567a71
commit 061d698e20
1 changed files with 9 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
drivers/rtc/rtc-ds1286.c
View file

@ -25,8 +25,6 @@
struct ds1286_priv { struct ds1286_priv {
struct rtc_device *rtc; struct rtc_device *rtc;
u32 __iomem *rtcregs; u32 __iomem *rtcregs;
size_t size;
unsigned long baseaddr;
spinlock_t lock; spinlock_t lock;
}; };
@ -333,56 +331,30 @@ static int ds1286_probe(struct platform_device *pdev)
struct rtc_device *rtc; struct rtc_device *rtc;
struct resource *res; struct resource *res;
struct ds1286_priv *priv; struct ds1286_priv *priv;
int ret = 0;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) if (!res)
return -ENODEV; return -ENODEV;
priv = kzalloc(sizeof(struct ds1286_priv), GFP_KERNEL); priv = devm_kzalloc(&pdev->dev, sizeof(struct ds1286_priv), GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
priv->size = resource_size(res); priv->rtcregs = devm_ioremap_resource(&pdev->dev, res);
if (!request_mem_region(res->start, priv->size, pdev->name)) { if (IS_ERR(priv->rtcregs))
ret = -EBUSY; return PTR_ERR(priv->rtcregs);
goto out;
}
priv->baseaddr = res->start;
priv->rtcregs = ioremap(priv->baseaddr, priv->size);
if (!priv->rtcregs) {
ret = -ENOMEM;
goto out;
}
spin_lock_init(&priv->lock); spin_lock_init(&priv->lock);
platform_set_drvdata(pdev, priv); platform_set_drvdata(pdev, priv);
rtc = rtc_device_register("ds1286", &pdev->dev, rtc = devm_rtc_device_register(&pdev->dev, "ds1286", &ds1286_ops,
&ds1286_ops, THIS_MODULE); THIS_MODULE);
if (IS_ERR(rtc)) { if (IS_ERR(rtc))
ret = PTR_ERR(rtc); return PTR_ERR(rtc);
goto out;
}
priv->rtc = rtc; priv->rtc = rtc;
return 0; return 0;
out:
if (priv->rtc)
rtc_device_unregister(priv->rtc);
if (priv->rtcregs)
iounmap(priv->rtcregs);
if (priv->baseaddr)
release_mem_region(priv->baseaddr, priv->size);
kfree(priv);
return ret;
} }
static int ds1286_remove(struct platform_device *pdev) static int ds1286_remove(struct platform_device *pdev)
{ {
struct ds1286_priv *priv = platform_get_drvdata(pdev);
rtc_device_unregister(priv->rtc);
iounmap(priv->rtcregs);
release_mem_region(priv->baseaddr, priv->size);
kfree(priv);
return 0; return 0;
} }