summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/spi/spi-pxa2xx-dma.c2
-rw-r--r--drivers/spi/spi-pxa2xx.c2
-rw-r--r--drivers/spi/spi-pxa2xx.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-pxa2xx-dma.c b/drivers/spi/spi-pxa2xx-dma.c
index 3d7f66080c57..5d0d8fe07966 100644
--- a/drivers/spi/spi-pxa2xx-dma.c
+++ b/drivers/spi/spi-pxa2xx-dma.c
@@ -144,7 +144,7 @@ irqreturn_t pxa2xx_spi_dma_transfer(struct driver_data *drv_data)
144 return IRQ_NONE; 144 return IRQ_NONE;
145} 145}
146 146
147int pxa2xx_spi_dma_prepare(struct driver_data *drv_data, u32 dma_burst) 147int pxa2xx_spi_dma_prepare(struct driver_data *drv_data)
148{ 148{
149 struct dma_async_tx_descriptor *tx_desc, *rx_desc; 149 struct dma_async_tx_descriptor *tx_desc, *rx_desc;
150 int err; 150 int err;
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 82dcb88fcfba..f4d4f5123189 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1108,7 +1108,7 @@ static void pump_transfers(unsigned long data)
1108 /* Ensure we have the correct interrupt handler */ 1108 /* Ensure we have the correct interrupt handler */
1109 drv_data->transfer_handler = pxa2xx_spi_dma_transfer; 1109 drv_data->transfer_handler = pxa2xx_spi_dma_transfer;
1110 1110
1111 err = pxa2xx_spi_dma_prepare(drv_data, dma_burst); 1111 err = pxa2xx_spi_dma_prepare(drv_data);
1112 if (err) { 1112 if (err) {
1113 message->status = err; 1113 message->status = err;
1114 giveback(drv_data); 1114 giveback(drv_data);
diff --git a/drivers/spi/spi-pxa2xx.h b/drivers/spi/spi-pxa2xx.h
index 513ec6c6e25b..08aa7e50d011 100644
--- a/drivers/spi/spi-pxa2xx.h
+++ b/drivers/spi/spi-pxa2xx.h
@@ -139,7 +139,7 @@ extern void *pxa2xx_spi_next_transfer(struct driver_data *drv_data);
139#define DEFAULT_DMA_CR1 (SSCR1_TSRE | SSCR1_RSRE | SSCR1_TRAIL) 139#define DEFAULT_DMA_CR1 (SSCR1_TSRE | SSCR1_RSRE | SSCR1_TRAIL)
140 140
141extern irqreturn_t pxa2xx_spi_dma_transfer(struct driver_data *drv_data); 141extern irqreturn_t pxa2xx_spi_dma_transfer(struct driver_data *drv_data);
142extern int pxa2xx_spi_dma_prepare(struct driver_data *drv_data, u32 dma_burst); 142extern int pxa2xx_spi_dma_prepare(struct driver_data *drv_data);
143extern void pxa2xx_spi_dma_start(struct driver_data *drv_data); 143extern void pxa2xx_spi_dma_start(struct driver_data *drv_data);
144extern int pxa2xx_spi_dma_setup(struct driver_data *drv_data); 144extern int pxa2xx_spi_dma_setup(struct driver_data *drv_data);
145extern void pxa2xx_spi_dma_release(struct driver_data *drv_data); 145extern void pxa2xx_spi_dma_release(struct driver_data *drv_data);