public inbox for linux-mmc@vger.kernel.org
 help / color / mirror / Atom feed
From: Russell King <rmk+kernel@arm.linux.org.uk>
To: Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com>,
	Mike Rapoport <mike@compulab.co.il>
Cc: linux-arm-kernel@lists.infradead.org, Chris Ball <cjb@laptop.org>,
	linux-mmc@vger.kernel.org
Subject: [PATCH 1/3] MMC: sdhci-dove: use devm_clk_get()
Date: Thu, 22 Nov 2012 23:55:10 +0000	[thread overview]
Message-ID: <E1Tbgbu-0007Kk-Pc@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20121122235426.GT3332@n2100.arm.linux.org.uk>

Use devm_clk_get() rather than clk_get() to make cleanup paths more simple.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 drivers/mmc/host/sdhci-dove.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c
index 8fd50a2..4233fd9 100644
--- a/drivers/mmc/host/sdhci-dove.c
+++ b/drivers/mmc/host/sdhci-dove.c
@@ -92,7 +92,7 @@ static int __devinit sdhci_dove_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
-	priv->clk = clk_get(&pdev->dev, NULL);
+	priv->clk = devm_clk_get(&pdev->dev, NULL);
 	if (!IS_ERR(priv->clk))
 		clk_prepare_enable(priv->clk);
 
@@ -107,10 +107,8 @@ static int __devinit sdhci_dove_probe(struct platform_device *pdev)
 	return 0;
 
 sdhci_dove_register_fail:
-	if (!IS_ERR(priv->clk)) {
+	if (!IS_ERR(priv->clk))
 		clk_disable_unprepare(priv->clk);
-		clk_put(priv->clk);
-	}
 	return ret;
 }
 
@@ -122,10 +120,9 @@ static int __devexit sdhci_dove_remove(struct platform_device *pdev)
 
 	sdhci_pltfm_unregister(pdev);
 
-	if (!IS_ERR(priv->clk)) {
+	if (!IS_ERR(priv->clk))
 		clk_disable_unprepare(priv->clk);
-		clk_put(priv->clk);
-	}
+
 	return 0;
 }
 
-- 
1.7.4.4


  reply	other threads:[~2012-11-22 23:58 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-22 23:54 [PATCH 0/3] sdhci-dove GPIO support for card detection Russell King - ARM Linux
2012-11-22 23:55 ` Russell King [this message]
2012-11-22 23:55 ` [PATCH 2/3] MMC: sdhci-dove: use two-stage initialization for sdhci-pltfm Russell King
2012-11-22 23:55 ` [PATCH 3/3] MMC: sdhci-dove: allow GPIOs to be used for card detection on Dove Russell King
2012-11-23  8:31   ` Shawn Guo
2012-11-23  8:57     ` Russell King - ARM Linux
2012-11-23 12:14       ` Shawn Guo
2012-11-23 12:55         ` Russell King - ARM Linux
2012-11-25 20:29           ` Chris Ball
2012-11-26  9:43             ` Guennadi Liakhovetski
2012-12-03 19:11               ` Chris Ball
2012-12-04 16:00                 ` Guennadi Liakhovetski
2012-12-04 16:06                   ` Chris Ball
2012-12-04 16:43                     ` Russell King - ARM Linux
2012-12-04 18:51                       ` Chris Ball
2012-11-26  6:53   ` Shawn Guo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1Tbgbu-0007Kk-Pc@rmk-PC.arm.linux.org.uk \
    --to=rmk+kernel@arm.linux.org.uk \
    --cc=cjb@laptop.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=mike@compulab.co.il \
    --cc=sebastian.hesselbarth@googlemail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox