Skip to contentSkip to conversation

ata: pata_arasam_cf: Use devm_clk_get

PATCH Applied Vaishali Thakkar 2 participants 2 messages Aug 22, 2015

Subsystems (2)
libata libata pata arasan compact flash controller
lore
Share & tools
lore

Vaishali Thakkar

author
#0 lore raw

PATCH 1/1 ata: pata_arasam_cf: Use devm_clk_get

This patch introduces the use of managed resource function devm_clk_get instead of clk_get and removes corresponding call to clk_put in the remove function.

To be compatible with the change various gotos are replaced with direct returns, and unneeded label is dropped.

Signed-off-by Vaishali Thakkar <[email protected]>
---
 drivers/ata/pata_arasan_cf.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/ata/pata_arasan_cf.c +4 -7
index 5d9ee99..80fe0f6 100644
@@ -834,7 +834,7 @@ static int arasan_cf_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
-	acdev->clk = clk_get(&pdev->dev, NULL);
+	acdev->clk = devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(acdev->clk)) {
 		dev_warn(&pdev->dev, "Clock not found\n");
 		return PTR_ERR(acdev->clk);

@@ -843,9 +843,8 @@ static int arasan_cf_probe(struct platform_device *pdev)
 	/* allocate host */
 	host = ata_host_alloc(&pdev->dev, 1);
 	if (!host) {
-		ret = -ENOMEM;
 		dev_warn(&pdev->dev, "alloc host fail\n");
-		goto free_clk;
+		return -ENOMEM;
 	}
 
 	ap = host->ports[0];

@@ -894,7 +893,7 @@ static int arasan_cf_probe(struct platform_device *pdev)
 
 	ret = cf_init(acdev);
 	if (ret)
-		goto free_clk;
+		return ret;
 
 	cf_card_detect(acdev, 0);
 

@@ -904,8 +903,7 @@ static int arasan_cf_probe(struct platform_device *pdev)
 		return 0;
 
 	cf_exit(acdev);
-free_clk:
-	clk_put(acdev->clk);
+
 	return ret;
 }
 

@@ -916,7 +914,6 @@ static int arasan_cf_remove(struct platform_device *pdev)
 
 	ata_host_detach(host);
 	cf_exit(acdev);
-	clk_put(acdev->clk);
 
 	return 0;
 }
Signature · 1 line
1.9.1
Applied
#1 lore raw
Quoted 8 lines · Vaishali Thakkar

This patch introduces the use of managed resource function devm_clk_get instead of clk_get and removes corresponding call to clk_put in the remove function.

To be compatible with the change various gotos are replaced with direct returns, and unneeded label is dropped.

Signed-off-by Vaishali Thakkar <[email protected]>

Applied to libata/for-4.3.

Thanks.

Signature · 1 line
tejun