diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-07-11 12:13:28 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-16 18:24:14 -0400 |
| commit | ef40eb39e0128b42d64bbbf5a6635548f6f68a01 (patch) | |
| tree | ac8fb25e769f226064119daadee41179cf82baf8 | |
| parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (diff) | |
spi: atmel: Use dmaengine_prep_slave_sg() API
Use the inline wrapper introduced by commit
16052827d98fbc13c31ebad560af4bd53e2b4dd5 ("dmaengine/dma_slave: introduce
inline wrappers").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | drivers/spi/spi-atmel.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index 92a6f0d93233..1fb90dda299b 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c | |||
| @@ -597,21 +597,15 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master, | |||
| 597 | goto err_exit; | 597 | goto err_exit; |
| 598 | 598 | ||
| 599 | /* Send both scatterlists */ | 599 | /* Send both scatterlists */ |
| 600 | rxdesc = rxchan->device->device_prep_slave_sg(rxchan, | 600 | rxdesc = dmaengine_prep_slave_sg(rxchan, &as->dma.sgrx, 1, |
| 601 | &as->dma.sgrx, | 601 | DMA_FROM_DEVICE, |
| 602 | 1, | 602 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
| 603 | DMA_FROM_DEVICE, | ||
| 604 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK, | ||
| 605 | NULL); | ||
| 606 | if (!rxdesc) | 603 | if (!rxdesc) |
| 607 | goto err_dma; | 604 | goto err_dma; |
| 608 | 605 | ||
| 609 | txdesc = txchan->device->device_prep_slave_sg(txchan, | 606 | txdesc = dmaengine_prep_slave_sg(txchan, &as->dma.sgtx, 1, |
| 610 | &as->dma.sgtx, | 607 | DMA_TO_DEVICE, |
| 611 | 1, | 608 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
| 612 | DMA_TO_DEVICE, | ||
| 613 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK, | ||
| 614 | NULL); | ||
| 615 | if (!txdesc) | 609 | if (!txdesc) |
| 616 | goto err_dma; | 610 | goto err_dma; |
| 617 | 611 | ||
