Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

spi: bcm63xx-hsspi: Use devm_clk_get()

Browse Source 
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>
This commit is contained in:
Jingoo Han 2013-12-09 19:20:45 +09:00 committed by Mark Brown
parent 87917528cc
commit b1bdd4f883
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/spi/spi-bcm63xx-hsspi.c
View File

@ -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;
}