Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Geert Uytterhoeven and committed by
Mark Brown
afcc98de 95029a00

+7 -7
+7 -7
drivers/spi/spi-rspi.c
··· 926 926 return 0; 927 927 } 928 928 929 - static void rspi_release_dma(struct rspi_data *rspi) 929 + static void rspi_release_dma(struct spi_master *master) 930 930 { 931 - if (rspi->master->dma_tx) 932 - dma_release_channel(rspi->master->dma_tx); 933 - if (rspi->master->dma_rx) 934 - dma_release_channel(rspi->master->dma_rx); 931 + if (master->dma_tx) 932 + dma_release_channel(master->dma_tx); 933 + if (master->dma_rx) 934 + dma_release_channel(master->dma_rx); 935 935 } 936 936 937 937 static int rspi_remove(struct platform_device *pdev) 938 938 { 939 939 struct rspi_data *rspi = platform_get_drvdata(pdev); 940 940 941 - rspi_release_dma(rspi); 941 + rspi_release_dma(rspi->master); 942 942 pm_runtime_disable(&pdev->dev); 943 943 944 944 return 0; ··· 1140 1140 return 0; 1141 1141 1142 1142 error3: 1143 - rspi_release_dma(rspi); 1143 + rspi_release_dma(master); 1144 1144 error2: 1145 1145 pm_runtime_disable(&pdev->dev); 1146 1146 error1: