mfd: htc-egpio: Use devm_ioremap_nocache() instead of ioremap_nocache()
Replace probe-time ioremap_nocache() call with devm_ioremap_nocache() to avoid iounmap() missing and get rid of the corresponding iounmap() call on remove. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
parent
c8eaed458e
commit
3f9850f262
|
@ -286,7 +286,8 @@ static int __init egpio_probe(struct platform_device *pdev)
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
if (!res)
|
if (!res)
|
||||||
goto fail;
|
goto fail;
|
||||||
ei->base_addr = ioremap_nocache(res->start, resource_size(res));
|
ei->base_addr = devm_ioremap_nocache(&pdev->dev, res->start,
|
||||||
|
resource_size(res));
|
||||||
if (!ei->base_addr)
|
if (!ei->base_addr)
|
||||||
goto fail;
|
goto fail;
|
||||||
pr_debug("EGPIO phys=%08x virt=%p\n", (u32)res->start, ei->base_addr);
|
pr_debug("EGPIO phys=%08x virt=%p\n", (u32)res->start, ei->base_addr);
|
||||||
|
@ -380,7 +381,6 @@ static int __exit egpio_remove(struct platform_device *pdev)
|
||||||
irq_set_chained_handler(ei->chained_irq, NULL);
|
irq_set_chained_handler(ei->chained_irq, NULL);
|
||||||
device_init_wakeup(&pdev->dev, 0);
|
device_init_wakeup(&pdev->dev, 0);
|
||||||
}
|
}
|
||||||
iounmap(ei->base_addr);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue