diff options
| -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 | ||