mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
mtd: nand: pxa3xx: Use devm_ioremap_resource
Using the new devm_ioremap_resource() we can greatly simplify resource handling. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
parent
4c073cd26e
commit
0ddd846f56
1 changed files with 4 additions and 27 deletions
|
@ -1108,30 +1108,16 @@ static int alloc_nand_resource(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (r == NULL) {
|
||||
dev_err(&pdev->dev, "no IO memory resource defined\n");
|
||||
ret = -ENODEV;
|
||||
info->mmio_base = devm_ioremap_resource(&pdev->dev, r);
|
||||
if (IS_ERR(info->mmio_base)) {
|
||||
ret = PTR_ERR(info->mmio_base);
|
||||
goto fail_put_clk;
|
||||
}
|
||||
|
||||
r = request_mem_region(r->start, resource_size(r), pdev->name);
|
||||
if (r == NULL) {
|
||||
dev_err(&pdev->dev, "failed to request memory resource\n");
|
||||
ret = -EBUSY;
|
||||
goto fail_put_clk;
|
||||
}
|
||||
|
||||
info->mmio_base = ioremap(r->start, resource_size(r));
|
||||
if (info->mmio_base == NULL) {
|
||||
dev_err(&pdev->dev, "ioremap() failed\n");
|
||||
ret = -ENODEV;
|
||||
goto fail_free_res;
|
||||
}
|
||||
info->mmio_phys = r->start;
|
||||
|
||||
ret = pxa3xx_nand_init_buff(info);
|
||||
if (ret)
|
||||
goto fail_free_io;
|
||||
goto fail_put_clk;
|
||||
|
||||
/* initialize all interrupts to be disabled */
|
||||
disable_int(info, NDSR_MASK);
|
||||
|
@ -1155,10 +1141,6 @@ static int alloc_nand_resource(struct platform_device *pdev)
|
|||
info->data_buff, info->data_buff_phys);
|
||||
} else
|
||||
kfree(info->data_buff);
|
||||
fail_free_io:
|
||||
iounmap(info->mmio_base);
|
||||
fail_free_res:
|
||||
release_mem_region(r->start, resource_size(r));
|
||||
fail_put_clk:
|
||||
clk_disable(info->clk);
|
||||
clk_put(info->clk);
|
||||
|
@ -1169,7 +1151,6 @@ static int pxa3xx_nand_remove(struct platform_device *pdev)
|
|||
{
|
||||
struct pxa3xx_nand_info *info = platform_get_drvdata(pdev);
|
||||
struct pxa3xx_nand_platform_data *pdata;
|
||||
struct resource *r;
|
||||
int irq, cs;
|
||||
|
||||
if (!info)
|
||||
|
@ -1188,10 +1169,6 @@ static int pxa3xx_nand_remove(struct platform_device *pdev)
|
|||
} else
|
||||
kfree(info->data_buff);
|
||||
|
||||
iounmap(info->mmio_base);
|
||||
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
release_mem_region(r->start, resource_size(r));
|
||||
|
||||
clk_disable(info->clk);
|
||||
clk_put(info->clk);
|
||||
|
||||
|
|
Loading…
Reference in a new issue