summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-bcm63xx-hsspi.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-12-09 19:20:45 +0900
committerMark Brown <broonie@linaro.org>2013-12-17 22:31:39 +0000
commitb1bdd4f883e1938a1921f300d7f164ce583b1a64 (patch)
treea44d13b51cb908335a06bb3caede84cc8fb76f02 /drivers/spi/spi-bcm63xx-hsspi.c
parent87917528cc922d0b91643dabacec01415c792086 (diff)
spi: bcm63xx-hsspi: Use devm_clk_get()
Use devm_clk_get() to make cleanup paths simpler. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Jonas Gorski <jogo@openwrt.org> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-bcm63xx-hsspi.c')
-rw-r--r--drivers/spi/spi-bcm63xx-hsspi.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c
index 2cfe8eb619fd..6a763a8a8a5e 100644
--- a/drivers/spi/spi-bcm63xx-hsspi.c
+++ b/drivers/spi/spi-bcm63xx-hsspi.c
@@ -342,16 +342,14 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)
if (IS_ERR(regs))
return PTR_ERR(regs);
- clk = clk_get(dev, "hsspi");
+ clk = devm_clk_get(dev, "hsspi");
if (IS_ERR(clk))
return PTR_ERR(clk);
rate = clk_get_rate(clk);
- if (!rate) {
- ret = -EINVAL;
- goto out_put_clk;
- }
+ if (!rate)
+ return -EINVAL;
clk_prepare_enable(clk);
@@ -409,9 +407,6 @@ out_put_master:
spi_master_put(master);
out_disable_clk:
clk_disable_unprepare(clk);
-out_put_clk:
- clk_put(clk);
-
return ret;
}
@@ -426,7 +421,6 @@ static int bcm63xx_hsspi_remove(struct platform_device *pdev)
/* reset the hardware and block queue progress */
__raw_writel(0, bs->regs + HSSPI_INT_MASK_REG);
clk_disable_unprepare(bs->clk);
- clk_put(bs->clk);
return 0;
}