evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

spi/bcm63xx-hsspi: use devm_register_master()

Browse source 
Simplifies the remove call.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Jonas Gorski 2013-12-17 21:44:47 +01:00 • committed by Mark Brown
parent dea5de1b37
commit 7d25569580
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/spi/spi-bcm63xx-hsspi.c
View file

@ -399,7 +399,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)
goto out_put_master; goto out_put_master;
/* register and we are done */ /* register and we are done */
ret = spi_register_master(master); ret = devm_spi_register_master(dev, master);
if (ret) if (ret)
goto out_put_master; goto out_put_master;
@ -418,8 +418,6 @@ static int bcm63xx_hsspi_remove(struct platform_device *pdev)
struct spi_master *master = platform_get_drvdata(pdev); struct spi_master *master = platform_get_drvdata(pdev);
struct bcm63xx_hsspi *bs = spi_master_get_devdata(master); struct bcm63xx_hsspi *bs = spi_master_get_devdata(master);
spi_unregister_master(master);
/* reset the hardware and block queue progress */ /* reset the hardware and block queue progress */
__raw_writel(0, bs->regs + HSSPI_INT_MASK_REG); __raw_writel(0, bs->regs + HSSPI_INT_MASK_REG);
clk_disable_unprepare(bs->clk); clk_disable_unprepare(bs->clk);