diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-11-15 11:44:02 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-15 14:24:00 +0400 |
| commit | 53063ec6e2cc38000f98a5de557b7e4fed186cfc (patch) | |
| tree | 02c636ce7f86c2f52860ca8da245c82c438685fe | |
| parent | 82f85cf98f0eb60093e8b3d606711c2d49538478 (diff) | |
| download | linux-53063ec6e2cc38000f98a5de557b7e4fed186cfc.tar.xz | |
spi: rspi: use platform drvdata correctly in rspi_remove()
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>
| -rw-r--r-- | drivers/spi/spi-rspi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index 58449ad4ad0d..9e829cee7357 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c @@ -885,14 +885,13 @@ static void rspi_release_dma(struct rspi_data *rspi) 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); rspi_release_dma(rspi); free_irq(platform_get_irq(pdev, 0), rspi); clk_put(rspi->clk); iounmap(rspi->addr); - spi_master_put(rspi->master); return 0; } |