summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBrian Niebuhr <bniebuhr@efjohnson.com>2010-09-24 18:53:32 +0530
committerSekhar Nori <nsekhar@ti.com>2010-11-18 18:38:33 +0530
commitb23a5d4691043e97bbfde8c2fb5b8fecdc400308 (patch)
tree8b6f66d23306761140b9501357fe9948ce5001c9 /drivers
parentbe88471b96cf3a0d7aea72d5ca9c6a95fb54bade (diff)
downloadlinux-stable-b23a5d4691043e97bbfde8c2fb5b8fecdc400308.tar.gz
linux-stable-b23a5d4691043e97bbfde8c2fb5b8fecdc400308.tar.bz2
linux-stable-b23a5d4691043e97bbfde8c2fb5b8fecdc400308.zip
spi: davinci: remove unnecessary call to davinci_spi_setup_transfer()
Remove unnecessary call to davinci_spi_setup_transfer() at the end of davinci_spi_setup(). davinci_spi_setup_transfer() is registered as the setup_transfer callback for the bitbang layer and is called independently by the bitbang layer to setup the transfer before it begins. Signed-off-by: Brian Niebuhr <bniebuhr@efjohnson.com> Tested-By: Michael Williamson <michael.williamson@criticallink.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/davinci_spi.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 05b6145da3ef..77109dc11b09 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -479,7 +479,7 @@ static int davinci_spi_request_dma(struct spi_device *spi)
*/
static int davinci_spi_setup(struct spi_device *spi)
{
- int retval;
+ int retval = 0;
struct davinci_spi *davinci_spi;
struct davinci_spi_dma *davinci_spi_dma;
struct davinci_spi_platform_data *pdata;
@@ -512,16 +512,11 @@ static int davinci_spi_setup(struct spi_device *spi)
if (use_dma && davinci_spi->dma_channels) {
davinci_spi_dma = &davinci_spi->dma_channels[spi->chip_select];
- if ((davinci_spi_dma->dma_rx_channel == -1)
- || (davinci_spi_dma->dma_tx_channel == -1)) {
+ if ((davinci_spi_dma->dma_rx_channel == -1) ||
+ (davinci_spi_dma->dma_tx_channel == -1))
retval = davinci_spi_request_dma(spi);
- if (retval < 0)
- return retval;
- }
}
- retval = davinci_spi_setup_transfer(spi, NULL);
-
return retval;
}