浏览代码

spi: txx9: Use devm_clk_get()

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>
Jingoo Han 11 年之前
父节点
当前提交
18e34d568e
共有 1 个文件被更改,包括 2 次插入5 次删除
  1. 2 5
      drivers/spi/spi-txx9.c

+ 2 - 5
drivers/spi/spi-txx9.c

@@ -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 @@ exit_busy:
 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;
 }
 }