nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

spi: txx9: Use devm_clk_get()

Browse source 
Use devm_clk_get() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Jingoo Han 2013-12-09 19:23:12 +09:00 committed by Mark Brown
parent 6ce4eac1f6
commit 18e34d568e
1 changed files with 2 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/spi/spi-txx9.c
View file

@ -348,7 +348,7 @@ static int txx9spi_probe(struct platform_device *dev)
INIT_LIST_HEAD(&c->queue); INIT_LIST_HEAD(&c->queue);
init_waitqueue_head(&c->waitq); init_waitqueue_head(&c->waitq);
c->clk = clk_get(&dev->dev, "spi-baseclk"); c->clk = devm_clk_get(&dev->dev, "spi-baseclk");
if (IS_ERR(c->clk)) { if (IS_ERR(c->clk)) {
ret = PTR_ERR(c->clk); ret = PTR_ERR(c->clk);
c->clk = NULL; c->clk = NULL;
@ -415,10 +415,8 @@ static int txx9spi_probe(struct platform_device *dev)
exit: exit:
if (c->workqueue) if (c->workqueue)
destroy_workqueue(c->workqueue); destroy_workqueue(c->workqueue);
if (c->clk) { if (c->clk)
clk_disable(c->clk); clk_disable(c->clk);
clk_put(c->clk);
}
spi_master_put(master); spi_master_put(master);
return ret; return ret;
} }
@ -430,7 +428,6 @@ static int txx9spi_remove(struct platform_device *dev)
destroy_workqueue(c->workqueue); destroy_workqueue(c->workqueue);
clk_disable(c->clk); clk_disable(c->clk);
clk_put(c->clk);
return 0; return 0;
} }