From: David Lechner Date: Tue, 18 Sep 2018 17:08:49 +0000 (-0500) Subject: spi: spi-davinci: Don't error when SPI_CS_WORD and cs_gpio X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f34ecdbd5661816ce8bbd7511f33181ffa8f4895;p=linux.git spi: spi-davinci: Don't error when SPI_CS_WORD and cs_gpio This remove the check and subsequent return of error for the case when a SPI device requires SPI_CS_WORD and is also configured to use a GPIO for the CS line. Commit a134cc414e86 ("spi: always use software fallback for SPI_CS_WORD when using cs_gio") handles this case now, so this check is no longer necessary. Signed-off-by: David Lechner Signed-off-by: Mark Brown --- diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index 205f763c73838..56adec83f8fc2 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c @@ -441,9 +441,6 @@ static int davinci_spi_setup(struct spi_device *spi) if (internal_cs) { set_io_bits(dspi->base + SPIPC0, 1 << spi->chip_select); - } else if (spi->mode & SPI_CS_WORD) { - dev_err(&spi->dev, "SPI_CS_WORD can't be use with GPIO CS\n"); - return -EINVAL; } }