diff options
Diffstat (limited to 'drivers/spi/davinci_spi.c')
-rw-r--r-- | drivers/spi/davinci_spi.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index 6b0476225217..2fa5bec807ce 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c | |||
@@ -175,7 +175,7 @@ struct davinci_spi { | |||
175 | u8 *tmp_buf; | 175 | u8 *tmp_buf; |
176 | int count; | 176 | int count; |
177 | struct davinci_spi_dma *dma_channels; | 177 | struct davinci_spi_dma *dma_channels; |
178 | struct davinci_spi_platform_data *pdata; | 178 | struct davinci_spi_platform_data *pdata; |
179 | 179 | ||
180 | void (*get_rx)(u32 rx_data, struct davinci_spi *); | 180 | void (*get_rx)(u32 rx_data, struct davinci_spi *); |
181 | u32 (*get_tx)(struct davinci_spi *); | 181 | u32 (*get_tx)(struct davinci_spi *); |
@@ -435,7 +435,6 @@ static int davinci_spi_request_dma(struct spi_device *spi) | |||
435 | * | 435 | * |
436 | * This functions sets the default transfer method. | 436 | * This functions sets the default transfer method. |
437 | */ | 437 | */ |
438 | |||
439 | static int davinci_spi_setup(struct spi_device *spi) | 438 | static int davinci_spi_setup(struct spi_device *spi) |
440 | { | 439 | { |
441 | int retval; | 440 | int retval; |
@@ -1096,7 +1095,6 @@ static int davinci_spi_probe(struct platform_device *pdev) | |||
1096 | } | 1095 | } |
1097 | clk_enable(davinci_spi->clk); | 1096 | clk_enable(davinci_spi->clk); |
1098 | 1097 | ||
1099 | |||
1100 | master->bus_num = pdev->id; | 1098 | master->bus_num = pdev->id; |
1101 | master->num_chipselect = pdata->num_chipselect; | 1099 | master->num_chipselect = pdata->num_chipselect; |
1102 | master->setup = davinci_spi_setup; | 1100 | master->setup = davinci_spi_setup; |
@@ -1113,15 +1111,15 @@ static int davinci_spi_probe(struct platform_device *pdev) | |||
1113 | davinci_spi->bitbang.flags |= SPI_READY; | 1111 | davinci_spi->bitbang.flags |= SPI_READY; |
1114 | 1112 | ||
1115 | if (use_dma) { | 1113 | if (use_dma) { |
1116 | r = platform_get_resource(pdev, IORESOURCE_DMA, 0); | 1114 | r = platform_get_resource(pdev, IORESOURCE_DMA, 0); |
1117 | if (r) | 1115 | if (r) |
1118 | dma_rx_chan = r->start; | 1116 | dma_rx_chan = r->start; |
1119 | r = platform_get_resource(pdev, IORESOURCE_DMA, 1); | 1117 | r = platform_get_resource(pdev, IORESOURCE_DMA, 1); |
1120 | if (r) | 1118 | if (r) |
1121 | dma_tx_chan = r->start; | 1119 | dma_tx_chan = r->start; |
1122 | r = platform_get_resource(pdev, IORESOURCE_DMA, 2); | 1120 | r = platform_get_resource(pdev, IORESOURCE_DMA, 2); |
1123 | if (r) | 1121 | if (r) |
1124 | dma_eventq = r->start; | 1122 | dma_eventq = r->start; |
1125 | } | 1123 | } |
1126 | 1124 | ||
1127 | if (!use_dma || | 1125 | if (!use_dma || |