spi: rspi: Pass spi_master pointer to rspi_release_dma()

rspi_release_dma() doesn't need access to any fields in the driver private
data, except for the pointer to the SPI master object. Hence just pass the
needed pointer.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit afcc98dec91b7754e754670bdec0290aa07c3565)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index ddee9df..38fd938 100644 (file)
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -926,19 +926,19 @@ static int rspi_request_dma(struct device *dev, struct spi_master *master,
        return 0;
 }
 
-static void rspi_release_dma(struct rspi_data *rspi)
+static void rspi_release_dma(struct spi_master *master)
 {
-       if (rspi->master->dma_tx)
-               dma_release_channel(rspi->master->dma_tx);
-       if (rspi->master->dma_rx)
-               dma_release_channel(rspi->master->dma_rx);
+       if (master->dma_tx)
+               dma_release_channel(master->dma_tx);
+       if (master->dma_rx)
+               dma_release_channel(master->dma_rx);
 }
 
 static int rspi_remove(struct platform_device *pdev)
 {
        struct rspi_data *rspi = platform_get_drvdata(pdev);
 
-       rspi_release_dma(rspi);
+       rspi_release_dma(rspi->master);
        pm_runtime_disable(&pdev->dev);
 
        return 0;
@@ -1140,7 +1140,7 @@ static int rspi_probe(struct platform_device *pdev)
        return 0;
 
 error3:
-       rspi_release_dma(rspi);
+       rspi_release_dma(master);
 error2:
        pm_runtime_disable(&pdev->dev);
 error1: