public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtc: rtc-vt8500: use devm_ioremap_resource()

Browse source 
Use devm_ioremap_resource() in order to make the code simpler, and move
'struct resource *res' from 'struct vt8500_rtc' to vt8500_rtc_probe()
because the 'res' variable is used only in vt8500_rtc_probe().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Tony Prisk <linux@prisktech.co.nz>
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 2014-04-03 14:49:49 -07:00 • committed by Linus Torvalds
parent 1e6789f6e2
commit caa3af259d
1 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/rtc/rtc-vt8500.c
View file

@ -79,7 +79,6 @@
struct vt8500_rtc { struct vt8500_rtc {
void __iomem *regbase; void __iomem *regbase;
struct resource *res;
int irq_alarm; int irq_alarm;
struct rtc_device *rtc; struct rtc_device *rtc;
spinlock_t lock; /* Protects this structure */ spinlock_t lock; /* Protects this structure */
@ -209,6 +208,7 @@ static const struct rtc_class_ops vt8500_rtc_ops = {
static int vt8500_rtc_probe(struct platform_device *pdev) static int vt8500_rtc_probe(struct platform_device *pdev)
{ {
struct vt8500_rtc *vt8500_rtc; struct vt8500_rtc *vt8500_rtc;
struct resource *res;
int ret; int ret;
vt8500_rtc = devm_kzalloc(&pdev->dev, vt8500_rtc = devm_kzalloc(&pdev->dev,
@ -219,34 +219,16 @@ static int vt8500_rtc_probe(struct platform_device *pdev)
spin_lock_init(&vt8500_rtc->lock); spin_lock_init(&vt8500_rtc->lock);
platform_set_drvdata(pdev, vt8500_rtc); platform_set_drvdata(pdev, vt8500_rtc);
vt8500_rtc->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!vt8500_rtc->res) {
dev_err(&pdev->dev, "No I/O memory resource defined\n");
return -ENXIO;
}
vt8500_rtc->irq_alarm = platform_get_irq(pdev, 0); vt8500_rtc->irq_alarm = platform_get_irq(pdev, 0);
if (vt8500_rtc->irq_alarm < 0) { if (vt8500_rtc->irq_alarm < 0) {
dev_err(&pdev->dev, "No alarm IRQ resource defined\n"); dev_err(&pdev->dev, "No alarm IRQ resource defined\n");
return vt8500_rtc->irq_alarm; return vt8500_rtc->irq_alarm;
} }
vt8500_rtc->res = devm_request_mem_region(&pdev->dev, res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
vt8500_rtc->res->start, vt8500_rtc->regbase = devm_ioremap_resource(&pdev->dev, res);
resource_size(vt8500_rtc->res), if (IS_ERR(vt8500_rtc->regbase))
"vt8500-rtc"); return PTR_ERR(vt8500_rtc->regbase);
if (vt8500_rtc->res == NULL) {
dev_err(&pdev->dev, "failed to request I/O memory\n");
return -EBUSY;
}
vt8500_rtc->regbase = devm_ioremap(&pdev->dev, vt8500_rtc->res->start,
resource_size(vt8500_rtc->res));
if (!vt8500_rtc->regbase) {
dev_err(&pdev->dev, "Unable to map RTC I/O memory\n");
ret = -EBUSY;
goto err_return;
}
/* Enable RTC and set it to 24-hour mode */ /* Enable RTC and set it to 24-hour mode */
writel(VT8500_RTC_CR_ENABLE, writel(VT8500_RTC_CR_ENABLE,