Commit 9ca7944d authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by David Woodhouse

mtd: nand: pxa3xx: Use devm_clk_get

Replacing clk_get by managed devm_clk_get, the error path
can be greatly simplified.
Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 0ddd846f
...@@ -1067,7 +1067,7 @@ static int alloc_nand_resource(struct platform_device *pdev) ...@@ -1067,7 +1067,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
spin_lock_init(&chip->controller->lock); spin_lock_init(&chip->controller->lock);
init_waitqueue_head(&chip->controller->wq); init_waitqueue_head(&chip->controller->wq);
info->clk = clk_get(&pdev->dev, NULL); info->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(info->clk)) { if (IS_ERR(info->clk)) {
dev_err(&pdev->dev, "failed to get nand clock\n"); dev_err(&pdev->dev, "failed to get nand clock\n");
return PTR_ERR(info->clk); return PTR_ERR(info->clk);
...@@ -1087,7 +1087,7 @@ static int alloc_nand_resource(struct platform_device *pdev) ...@@ -1087,7 +1087,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
if (r == NULL) { if (r == NULL) {
dev_err(&pdev->dev, "no resource defined for data DMA\n"); dev_err(&pdev->dev, "no resource defined for data DMA\n");
ret = -ENXIO; ret = -ENXIO;
goto fail_put_clk; goto fail_disable_clk;
} }
info->drcmr_dat = r->start; info->drcmr_dat = r->start;
...@@ -1095,7 +1095,7 @@ static int alloc_nand_resource(struct platform_device *pdev) ...@@ -1095,7 +1095,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
if (r == NULL) { if (r == NULL) {
dev_err(&pdev->dev, "no resource defined for command DMA\n"); dev_err(&pdev->dev, "no resource defined for command DMA\n");
ret = -ENXIO; ret = -ENXIO;
goto fail_put_clk; goto fail_disable_clk;
} }
info->drcmr_cmd = r->start; info->drcmr_cmd = r->start;
} }
...@@ -1104,20 +1104,20 @@ static int alloc_nand_resource(struct platform_device *pdev) ...@@ -1104,20 +1104,20 @@ static int alloc_nand_resource(struct platform_device *pdev)
if (irq < 0) { if (irq < 0) {
dev_err(&pdev->dev, "no IRQ resource defined\n"); dev_err(&pdev->dev, "no IRQ resource defined\n");
ret = -ENXIO; ret = -ENXIO;
goto fail_put_clk; goto fail_disable_clk;
} }
r = platform_get_resource(pdev, IORESOURCE_MEM, 0); r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
info->mmio_base = devm_ioremap_resource(&pdev->dev, r); info->mmio_base = devm_ioremap_resource(&pdev->dev, r);
if (IS_ERR(info->mmio_base)) { if (IS_ERR(info->mmio_base)) {
ret = PTR_ERR(info->mmio_base); ret = PTR_ERR(info->mmio_base);
goto fail_put_clk; goto fail_disable_clk;
} }
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_put_clk; goto fail_disable_clk;
/* initialize all interrupts to be disabled */ /* initialize all interrupts to be disabled */
disable_int(info, NDSR_MASK); disable_int(info, NDSR_MASK);
...@@ -1141,9 +1141,8 @@ static int alloc_nand_resource(struct platform_device *pdev) ...@@ -1141,9 +1141,8 @@ 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_put_clk: fail_disable_clk:
clk_disable(info->clk); clk_disable(info->clk);
clk_put(info->clk);
return ret; return ret;
} }
...@@ -1170,7 +1169,6 @@ static int pxa3xx_nand_remove(struct platform_device *pdev) ...@@ -1170,7 +1169,6 @@ static int pxa3xx_nand_remove(struct platform_device *pdev)
kfree(info->data_buff); kfree(info->data_buff);
clk_disable(info->clk); clk_disable(info->clk);
clk_put(info->clk);
for (cs = 0; cs < pdata->num_cs; cs++) for (cs = 0; cs < pdata->num_cs; cs++)
nand_release(info->host[cs]->mtd); nand_release(info->host[cs]->mtd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment