Commit a6f4c8e0 authored by Jingoo Han's avatar Jingoo Han Committed by Mark Brown

spi: ath79: Use devm_*() functions

Use devm_*() functions to make cleanup paths simpler.
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 6ce4eac1
...@@ -243,21 +243,21 @@ static int ath79_spi_probe(struct platform_device *pdev) ...@@ -243,21 +243,21 @@ static int ath79_spi_probe(struct platform_device *pdev)
goto err_put_master; goto err_put_master;
} }
sp->base = ioremap(r->start, resource_size(r)); sp->base = devm_ioremap(&pdev->dev, r->start, resource_size(r));
if (!sp->base) { if (!sp->base) {
ret = -ENXIO; ret = -ENXIO;
goto err_put_master; goto err_put_master;
} }
sp->clk = clk_get(&pdev->dev, "ahb"); sp->clk = devm_clk_get(&pdev->dev, "ahb");
if (IS_ERR(sp->clk)) { if (IS_ERR(sp->clk)) {
ret = PTR_ERR(sp->clk); ret = PTR_ERR(sp->clk);
goto err_unmap; goto err_put_master;
} }
ret = clk_enable(sp->clk); ret = clk_enable(sp->clk);
if (ret) if (ret)
goto err_clk_put; goto err_put_master;
rate = DIV_ROUND_UP(clk_get_rate(sp->clk), MHZ); rate = DIV_ROUND_UP(clk_get_rate(sp->clk), MHZ);
if (!rate) { if (!rate) {
...@@ -280,10 +280,6 @@ static int ath79_spi_probe(struct platform_device *pdev) ...@@ -280,10 +280,6 @@ static int ath79_spi_probe(struct platform_device *pdev)
ath79_spi_disable(sp); ath79_spi_disable(sp);
err_clk_disable: err_clk_disable:
clk_disable(sp->clk); clk_disable(sp->clk);
err_clk_put:
clk_put(sp->clk);
err_unmap:
iounmap(sp->base);
err_put_master: err_put_master:
spi_master_put(sp->bitbang.master); spi_master_put(sp->bitbang.master);
...@@ -297,8 +293,6 @@ static int ath79_spi_remove(struct platform_device *pdev) ...@@ -297,8 +293,6 @@ static int ath79_spi_remove(struct platform_device *pdev)
spi_bitbang_stop(&sp->bitbang); spi_bitbang_stop(&sp->bitbang);
ath79_spi_disable(sp); ath79_spi_disable(sp);
clk_disable(sp->clk); clk_disable(sp->clk);
clk_put(sp->clk);
iounmap(sp->base);
spi_master_put(sp->bitbang.master); spi_master_put(sp->bitbang.master);
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