linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/6] ata: i.MX PATA: Use devm_clk_get
Date: Thu,  4 Apr 2013 11:25:04 +0200	[thread overview]
Message-ID: <1365067509-10186-2-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1365067509-10186-1-git-send-email-s.hauer@pengutronix.de>

To make the error path a bit simpler.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/ata/pata_imx.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c
index 4084944..af893dd 100644
--- a/drivers/ata/pata_imx.c
+++ b/drivers/ata/pata_imx.c
@@ -112,7 +112,7 @@ static int pata_imx_probe(struct platform_device *pdev)
 	if (!priv)
 		return -ENOMEM;
 
-	priv->clk = clk_get(&pdev->dev, NULL);
+	priv->clk = devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(priv->clk)) {
 		dev_err(&pdev->dev, "Failed to get clock\n");
 		return PTR_ERR(priv->clk);
@@ -163,7 +163,7 @@ static int pata_imx_probe(struct platform_device *pdev)
 
 free_priv:
 	clk_disable_unprepare(priv->clk);
-	clk_put(priv->clk);
+
 	return -ENOMEM;
 }
 
@@ -177,7 +177,6 @@ static int pata_imx_remove(struct platform_device *pdev)
 	__raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN);
 
 	clk_disable_unprepare(priv->clk);
-	clk_put(priv->clk);
 
 	return 0;
 }
-- 
1.8.2.rc2

  reply	other threads:[~2013-04-04  9:25 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-04  9:25 [PATCH] i.MX PATA cleanup and i.MX51 support Sascha Hauer
2013-04-04  9:25 ` Sascha Hauer [this message]
2013-04-04  9:25 ` [PATCH 2/6] ata: i.MX PATA: cleanup error path Sascha Hauer
2013-04-04  9:25 ` [PATCH 3/6] ata: i.MX PATA: use void __iomem * for regs Sascha Hauer
2013-04-04  9:25 ` [PATCH 4/6] ata: i.MX PATA: add devicetree support Sascha Hauer
2013-04-11 23:38   ` Jeff Garzik
2013-04-04  9:25 ` [PATCH 5/6] ARM: i.MX5: Add PATA and SRTC clocks Sascha Hauer
2013-04-04 13:13   ` Shawn Guo
2013-04-04  9:25 ` [PATCH 6/6] ARM: i.MX51: Add PATA support Sascha Hauer
2013-04-09  7:41 ` [PATCH] i.MX PATA cleanup and i.MX51 support Sascha Hauer

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=1365067509-10186-2-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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;
as well as URLs for NNTP newsgroup(s).