Message ID | 1389531629-6026-1-git-send-email-geert@linux-m68k.org (mailing list archive) |
---|---|
State | Accepted |
Commit | 1afd9989a6a2561183be82e420d4d2f3889b7ee7 |
Headers | show |
On Sun, Jan 12, 2014 at 02:00:29PM +0100, Geert Uytterhoeven wrote: > From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> > > - Rephrase the comments about tx/rx_nbits validity checks, > - Remove the stale comment about SPI_3WIRE (the code it refers to was > removed in commit 368ca4e0c75612c0a4d6bbcef7efb944604340c2 ("spi: > Eliminate 3WIRE spi_transfer check")). Applied, thanks.
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index eaaad9d7fa84..ccb8a00ee83d 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1667,9 +1667,8 @@ static int __spi_async(struct spi_device *spi, struct spi_message *message) if (xfer->rx_buf && !xfer->rx_nbits) xfer->rx_nbits = SPI_NBITS_SINGLE; /* check transfer tx/rx_nbits: - * 1. keep the value is not out of single, dual and quad - * 2. keep tx/rx_nbits is contained by mode in spi_device - * 3. if SPI_3WIRE, tx/rx_nbits should be in single + * 1. check the value matches one of single, dual and quad + * 2. check tx/rx_nbits match the mode in spi_device */ if (xfer->tx_buf) { if (xfer->tx_nbits != SPI_NBITS_SINGLE &&