Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b23a5d46 authored by Brian Niebuhr's avatar Brian Niebuhr Committed by Sekhar Nori
Browse files

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: default avatarBrian Niebuhr <bniebuhr@efjohnson.com>
Tested-By: default avatarMichael Williamson <michael.williamson@criticallink.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent be88471b

drivers/spi/davinci_spi.c

+3 −8
Original line number Diff line number Diff line
@@ -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;

}