diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-11-22 18:55:10 -0500 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-12-06 13:55:13 -0500 |
commit | 7430e77e64000133c50cbd287d44733b4f487dc5 (patch) | |
tree | 080508f0f9f987afc8458ca2ab5307f2871d36eb /drivers/mmc | |
parent | a4071fbbb9edbc5a24985b2f64ed45f35b90dbeb (diff) |
mmc: sdhci-dove: use devm_clk_get()
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>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | 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 8fd50a211037..4233fd98e3aa 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) | |||
92 | return -ENOMEM; | 92 | return -ENOMEM; |
93 | } | 93 | } |
94 | 94 | ||
95 | priv->clk = clk_get(&pdev->dev, NULL); | 95 | priv->clk = devm_clk_get(&pdev->dev, NULL); |
96 | if (!IS_ERR(priv->clk)) | 96 | if (!IS_ERR(priv->clk)) |
97 | clk_prepare_enable(priv->clk); | 97 | clk_prepare_enable(priv->clk); |
98 | 98 | ||
@@ -107,10 +107,8 @@ static int __devinit sdhci_dove_probe(struct platform_device *pdev) | |||
107 | return 0; | 107 | return 0; |
108 | 108 | ||
109 | sdhci_dove_register_fail: | 109 | sdhci_dove_register_fail: |
110 | if (!IS_ERR(priv->clk)) { | 110 | if (!IS_ERR(priv->clk)) |
111 | clk_disable_unprepare(priv->clk); | 111 | clk_disable_unprepare(priv->clk); |
112 | clk_put(priv->clk); | ||
113 | } | ||
114 | return ret; | 112 | return ret; |
115 | } | 113 | } |
116 | 114 | ||
@@ -122,10 +120,9 @@ static int __devexit sdhci_dove_remove(struct platform_device *pdev) | |||
122 | 120 | ||
123 | sdhci_pltfm_unregister(pdev); | 121 | sdhci_pltfm_unregister(pdev); |
124 | 122 | ||
125 | if (!IS_ERR(priv->clk)) { | 123 | if (!IS_ERR(priv->clk)) |
126 | clk_disable_unprepare(priv->clk); | 124 | clk_disable_unprepare(priv->clk); |
127 | clk_put(priv->clk); | 125 | |
128 | } | ||
129 | return 0; | 126 | return 0; |
130 | } | 127 | } |
131 | 128 | ||