diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-12-09 11:20:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-17 23:35:50 +0100 |
| commit | acf4fc6ffa84b59e83f34f587be623a05bc0c55c (patch) | |
| tree | ad7d8c9e11410b5ab4acc8bbaa7202d1f080ec0c /drivers/spi | |
| parent | Linux 3.13-rc1 (diff) | |
| download | linux-acf4fc6ffa84b59e83f34f587be623a05bc0c55c.tar.xz linux-acf4fc6ffa84b59e83f34f587be623a05bc0c55c.zip | |
spi: bcm63xx: 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')
| -rw-r--r-- | drivers/spi/spi-bcm63xx.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index 80d56b214eb5..7b4ead78782c 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -345,22 +345,19 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq < 0) { dev_err(dev, "no irq\n"); - ret = -ENXIO; - goto out; + return -ENXIO; } - clk = clk_get(dev, "spi"); + clk = devm_clk_get(dev, "spi"); if (IS_ERR(clk)) { dev_err(dev, "no clock for device\n"); - ret = PTR_ERR(clk); - goto out; + return PTR_ERR(clk); } master = spi_alloc_master(dev, sizeof(*bs)); if (!master) { dev_err(dev, "out of memory\n"); - ret = -ENOMEM; - goto out_clk; + return -ENOMEM; } bs = spi_master_get_devdata(master); @@ -427,9 +424,6 @@ out_clk_disable: clk_disable_unprepare(clk); out_err: spi_master_put(master); -out_clk: - clk_put(clk); -out: return ret; } @@ -443,7 +437,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) /* HW shutdown */ clk_disable_unprepare(bs->clk); - clk_put(bs->clk); return 0; } |