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

spi: rspi: use platform drvdata correctly in rspi_remove()

Browse source 
We had set the platform drvdata in rspi_probe() as a type of
struct rspi_data, but use it as struct spi_master in rspi_remove()
Fix by remove the unnecessary spi_master_[get|put]() since rspi->master
is no longer used after spi_unregister_master().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Wei Yongjun 2013-11-15 15:44:02 +08:00 • committed by Mark Brown
parent 82f85cf98f
commit 53063ec6e2
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/spi/spi-rspi.c
View file

@ -885,14 +885,13 @@ static void rspi_release_dma(struct rspi_data *rspi)
static int rspi_remove(struct platform_device *pdev) static int rspi_remove(struct platform_device *pdev)
{ {
struct rspi_data *rspi = spi_master_get(platform_get_drvdata(pdev)); struct rspi_data *rspi = platform_get_drvdata(pdev);
spi_unregister_master(rspi->master); spi_unregister_master(rspi->master);
rspi_release_dma(rspi); rspi_release_dma(rspi);
free_irq(platform_get_irq(pdev, 0), rspi); free_irq(platform_get_irq(pdev, 0), rspi);
clk_put(rspi->clk); clk_put(rspi->clk);
iounmap(rspi->addr); iounmap(rspi->addr);
spi_master_put(rspi->master);
return 0; return 0;
} }