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>

diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c
index 2cfe8eb619fdf24db0bbd47ec6a4b7b51fbdf1cd..6a763a8a8a5e707d84dcb0d3448346086790ef9f 100644 (file)
--- 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;
 }