提交 0ddd846f 编写于 作者: E Ezequiel Garcia 提交者: David Woodhouse

mtd: nand: pxa3xx: Use devm_ioremap_resource

Using the new devm_ioremap_resource() we can greatly
simplify resource handling.
Signed-off-by: NEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: NArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>
上级 4c073cd2
...@@ -1108,30 +1108,16 @@ static int alloc_nand_resource(struct platform_device *pdev) ...@@ -1108,30 +1108,16 @@ static int alloc_nand_resource(struct platform_device *pdev)
} }
r = platform_get_resource(pdev, IORESOURCE_MEM, 0); r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (r == NULL) { info->mmio_base = devm_ioremap_resource(&pdev->dev, r);
dev_err(&pdev->dev, "no IO memory resource defined\n"); if (IS_ERR(info->mmio_base)) {
ret = -ENODEV; ret = PTR_ERR(info->mmio_base);
goto fail_put_clk; 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; info->mmio_phys = r->start;
ret = pxa3xx_nand_init_buff(info); ret = pxa3xx_nand_init_buff(info);
if (ret) if (ret)
goto fail_free_io; goto fail_put_clk;
/* initialize all interrupts to be disabled */ /* initialize all interrupts to be disabled */
disable_int(info, NDSR_MASK); disable_int(info, NDSR_MASK);
...@@ -1155,10 +1141,6 @@ static int alloc_nand_resource(struct platform_device *pdev) ...@@ -1155,10 +1141,6 @@ static int alloc_nand_resource(struct platform_device *pdev)
info->data_buff, info->data_buff_phys); info->data_buff, info->data_buff_phys);
} else } else
kfree(info->data_buff); 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: fail_put_clk:
clk_disable(info->clk); clk_disable(info->clk);
clk_put(info->clk); clk_put(info->clk);
...@@ -1169,7 +1151,6 @@ static int pxa3xx_nand_remove(struct platform_device *pdev) ...@@ -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_info *info = platform_get_drvdata(pdev);
struct pxa3xx_nand_platform_data *pdata; struct pxa3xx_nand_platform_data *pdata;
struct resource *r;
int irq, cs; int irq, cs;
if (!info) if (!info)
...@@ -1188,10 +1169,6 @@ static int pxa3xx_nand_remove(struct platform_device *pdev) ...@@ -1188,10 +1169,6 @@ static int pxa3xx_nand_remove(struct platform_device *pdev)
} else } else
kfree(info->data_buff); 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_disable(info->clk);
clk_put(info->clk); clk_put(info->clk);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册