1 files changed, 8 insertions, 14 deletions

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 92a6f0d93233..113c83f44b5c 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,
                 goto err_exit;
 
         /* Send both scatterlists */
-        rxdesc = rxchan->device->device_prep_slave_sg(rxchan,
-                                        &as->dma.sgrx,
-                                        1,
-                                        DMA_FROM_DEVICE,
-                                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK,
-                                        NULL);
+        rxdesc = dmaengine_prep_slave_sg(rxchan, &as->dma.sgrx, 1,
+                                         DMA_FROM_DEVICE,
+                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!rxdesc)
                 goto err_dma;
 
-        txdesc = txchan->device->device_prep_slave_sg(txchan,
-                                        &as->dma.sgtx,
-                                        1,
-                                        DMA_TO_DEVICE,
-                                        DMA_PREP_INTERRUPT | DMA_CTRL_ACK,
-                                        NULL);
+        txdesc = dmaengine_prep_slave_sg(txchan, &as->dma.sgtx, 1,
+                                         DMA_TO_DEVICE,
+                                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!txdesc)
                 goto err_dma;
 
@@ -1018,7 +1012,7 @@ static int atmel_spi_setup(struct spi_device *spi)
         csr |= SPI_BF(DLYBCT, 0);
 
         /* chipselect must have been muxed as GPIO (e.g. in board setup) */
-        npcs_pin = (unsigned int)spi->controller_data;
+        npcs_pin = (unsigned long)spi->controller_data;
 
         if (gpio_is_valid(spi->cs_gpio))
                 npcs_pin = spi->cs_gpio;
@@ -1253,7 +1247,7 @@ msg_done:
 static void atmel_spi_cleanup(struct spi_device *spi)
 {
         struct atmel_spi_device *asd = spi->controller_state;
-        unsigned                gpio = (unsigned) spi->controller_data;
+        unsigned                gpio = (unsigned long) spi->controller_data;
 
         if (!asd)
                 return;