| From 70b7a5f752b38fd35becb82f4e29a89692089faf Mon Sep 17 00:00:00 2001 |
| From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> |
| Date: Fri, 15 Nov 2013 15:44:02 +0800 |
| Subject: 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> |
| (cherry picked from commit 53063ec6e2cc38000f98a5de557b7e4fed186cfc) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/spi/spi-rspi.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c |
| index 437e052695a7..0d39fa614da7 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; |
| } |
| -- |
| 1.8.5.rc3 |
| |
