Skip to content

Commit

Permalink
spi: rspi: Pass spi_master pointer to rspi_release_dma()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geert Uytterhoeven authored and Mark Brown committed Jul 7, 2014
1 parent 95029a0 commit afcc98d
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/spi/spi-rspi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit afcc98d

Please sign in to comment.