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

Commit 368ca4e0 authored by Trent Piepho's avatar Trent Piepho Committed by Mark Brown
Browse files

spi: Eliminate 3WIRE spi_transfer check 



Checking for SPI_3WIRE isn't needed.  spi_setup() already prevents 3WIRE
mode from being combined with DUAL or QUAD mode support.  So there is no
need to differentiate between a single bit device with SPI_3WIRE set and
one with without.  It doesn't change the allowed bit widths.

Signed-off-by: default avatarTrent Piepho <tpiepho@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 89c1f607

drivers/spi/spi.c

+0 −6
Original line number Diff line number Diff line
@@ -1678,9 +1678,6 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message) 
			if ((xfer->tx_nbits == SPI_NBITS_QUAD) &&

				!(spi->mode & SPI_TX_QUAD))

				return -EINVAL;

			if ((spi->mode & SPI_3WIRE) &&

				(xfer->tx_nbits != SPI_NBITS_SINGLE))

				return -EINVAL;

		}

		/* check transfer rx_nbits */

		if (xfer->rx_buf) {
@@ -1694,9 +1691,6 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message) 
			if ((xfer->rx_nbits == SPI_NBITS_QUAD) &&

				!(spi->mode & SPI_RX_QUAD))

				return -EINVAL;

			if ((spi->mode & SPI_3WIRE) &&

				(xfer->rx_nbits != SPI_NBITS_SINGLE))

				return -EINVAL;

		}

	}