aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/davinci_spi.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 2fa5bec807ce..a92f507eaff7 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -299,12 +299,10 @@ static int davinci_spi_setup_transfer(struct spi_device *spi,
299{ 299{
300 300
301 struct davinci_spi *davinci_spi; 301 struct davinci_spi *davinci_spi;
302 struct davinci_spi_platform_data *pdata;
303 u8 bits_per_word = 0; 302 u8 bits_per_word = 0;
304 u32 hz = 0, prescale = 0, clkspeed; 303 u32 hz = 0, prescale = 0, clkspeed;
305 304
306 davinci_spi = spi_master_get_devdata(spi->master); 305 davinci_spi = spi_master_get_devdata(spi->master);
307 pdata = davinci_spi->pdata;
308 306
309 if (t) { 307 if (t) {
310 bits_per_word = t->bits_per_word; 308 bits_per_word = t->bits_per_word;
@@ -357,11 +355,9 @@ static void davinci_spi_dma_rx_callback(unsigned lch, u16 ch_status, void *data)
357 struct spi_device *spi = (struct spi_device *)data; 355 struct spi_device *spi = (struct spi_device *)data;
358 struct davinci_spi *davinci_spi; 356 struct davinci_spi *davinci_spi;
359 struct davinci_spi_dma *davinci_spi_dma; 357 struct davinci_spi_dma *davinci_spi_dma;
360 struct davinci_spi_platform_data *pdata;
361 358
362 davinci_spi = spi_master_get_devdata(spi->master); 359 davinci_spi = spi_master_get_devdata(spi->master);
363 davinci_spi_dma = &(davinci_spi->dma_channels[spi->chip_select]); 360 davinci_spi_dma = &(davinci_spi->dma_channels[spi->chip_select]);
364 pdata = davinci_spi->pdata;
365 361
366 if (ch_status == DMA_COMPLETE) 362 if (ch_status == DMA_COMPLETE)
367 edma_stop(davinci_spi_dma->dma_rx_channel); 363 edma_stop(davinci_spi_dma->dma_rx_channel);
@@ -378,11 +374,9 @@ static void davinci_spi_dma_tx_callback(unsigned lch, u16 ch_status, void *data)
378 struct spi_device *spi = (struct spi_device *)data; 374 struct spi_device *spi = (struct spi_device *)data;
379 struct davinci_spi *davinci_spi; 375 struct davinci_spi *davinci_spi;
380 struct davinci_spi_dma *davinci_spi_dma; 376 struct davinci_spi_dma *davinci_spi_dma;
381 struct davinci_spi_platform_data *pdata;
382 377
383 davinci_spi = spi_master_get_devdata(spi->master); 378 davinci_spi = spi_master_get_devdata(spi->master);
384 davinci_spi_dma = &(davinci_spi->dma_channels[spi->chip_select]); 379 davinci_spi_dma = &(davinci_spi->dma_channels[spi->chip_select]);
385 pdata = davinci_spi->pdata;
386 380
387 if (ch_status == DMA_COMPLETE) 381 if (ch_status == DMA_COMPLETE)
388 edma_stop(davinci_spi_dma->dma_tx_channel); 382 edma_stop(davinci_spi_dma->dma_tx_channel);
@@ -398,13 +392,11 @@ static int davinci_spi_request_dma(struct spi_device *spi)
398{ 392{
399 struct davinci_spi *davinci_spi; 393 struct davinci_spi *davinci_spi;
400 struct davinci_spi_dma *davinci_spi_dma; 394 struct davinci_spi_dma *davinci_spi_dma;
401 struct davinci_spi_platform_data *pdata;
402 struct device *sdev; 395 struct device *sdev;
403 int r; 396 int r;
404 397
405 davinci_spi = spi_master_get_devdata(spi->master); 398 davinci_spi = spi_master_get_devdata(spi->master);
406 davinci_spi_dma = &davinci_spi->dma_channels[spi->chip_select]; 399 davinci_spi_dma = &davinci_spi->dma_channels[spi->chip_select];
407 pdata = davinci_spi->pdata;
408 sdev = davinci_spi->bitbang.master->dev.parent; 400 sdev = davinci_spi->bitbang.master->dev.parent;
409 401
410 r = edma_alloc_channel(davinci_spi_dma->dma_rx_sync_dev, 402 r = edma_alloc_channel(davinci_spi_dma->dma_rx_sync_dev,