From: Geert Uytterhoeven Date: Fri, 6 Jun 2014 11:38:43 +0000 (+0200) Subject: spi: rspi: Pass spi_master pointer to rspi_release_dma() X-Git-Tag: upstream/snapshot3+hdmi~329 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=491a4f82a0bf7e15ffb003582479ac5a5a58f63a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Signed-off-by: Mark Brown (cherry picked from commit afcc98dec91b7754e754670bdec0290aa07c3565) Signed-off-by: Simon Horman --- diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index ddee9df..38fd938 100644 --- 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: