mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
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>
This commit is contained in:
parent
be88471b96
commit
b23a5d4691
1 changed files with 3 additions and 8 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue