Commit fb8ed2ca authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Boris Brezillon

mtd: nand: fsmc: use devm_clk_get()

This commit switches the fsmc_nand driver from clk_get() to
devm_clk_get(), which saves a few clk_put().
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent a1b1e1d5
...@@ -870,7 +870,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) ...@@ -870,7 +870,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
if (IS_ERR(host->regs_va)) if (IS_ERR(host->regs_va))
return PTR_ERR(host->regs_va); return PTR_ERR(host->regs_va);
host->clk = clk_get(&pdev->dev, NULL); host->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(host->clk)) { if (IS_ERR(host->clk)) {
dev_err(&pdev->dev, "failed to fetch block clock\n"); dev_err(&pdev->dev, "failed to fetch block clock\n");
return PTR_ERR(host->clk); return PTR_ERR(host->clk);
...@@ -878,7 +878,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) ...@@ -878,7 +878,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
ret = clk_prepare_enable(host->clk); ret = clk_prepare_enable(host->clk);
if (ret) if (ret)
goto err_clk_prepare_enable; return ret;
/* /*
* This device ID is actually a common AMBA ID as used on the * This device ID is actually a common AMBA ID as used on the
...@@ -1045,8 +1045,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) ...@@ -1045,8 +1045,6 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
dma_release_channel(host->read_dma_chan); dma_release_channel(host->read_dma_chan);
err_req_read_chnl: err_req_read_chnl:
clk_disable_unprepare(host->clk); clk_disable_unprepare(host->clk);
err_clk_prepare_enable:
clk_put(host->clk);
return ret; return ret;
} }
...@@ -1065,7 +1063,6 @@ static int fsmc_nand_remove(struct platform_device *pdev) ...@@ -1065,7 +1063,6 @@ static int fsmc_nand_remove(struct platform_device *pdev)
dma_release_channel(host->read_dma_chan); dma_release_channel(host->read_dma_chan);
} }
clk_disable_unprepare(host->clk); clk_disable_unprepare(host->clk);
clk_put(host->clk);
} }
return 0; return 0;
......
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