summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-04-04 11:25:04 +0200
committerJeff Garzik <jgarzik@redhat.com>2013-04-11 19:37:38 -0400
commit50f5a3415c2fc494e2bd80fc9e80cc62d64cbc3c (patch)
treedf52c427d493e3878dd0ab75ebce17fef92fee89 /drivers/ata
parent2de1d5e159ccf317a9285a0dfaa6e4262500d7dd (diff)
downloadlinux-50f5a3415c2fc494e2bd80fc9e80cc62d64cbc3c.tar.bz2
pata_imx: Use devm_clk_get
To make the error path a bit simpler. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/pata_imx.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c
index 40849445a9dc..af893dda8528 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;
}