Merge remote-tracking branches 'spi/topic/bus-num', 'spi/topic/cleanup', 'spi/topic...

[sfrench/cifs-2.6.git] / drivers / spi / spi-omap-uwire.c

diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c
index a4d7bb557792c0c1c241777bdaafb1e817696aff..8062909b9f5e65d564e413e21159f1403ee42806 100644 (file)
--- a/drivers/spi/spi-omap-uwire.c
+++ b/drivers/spi/spi-omap-uwire.c
@@ -332,12 +332,6 @@ static int uwire_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
 
        uwire = spi_master_get_devdata(spi->master);
 
-       if (spi->chip_select > 3) {
-               pr_debug("%s: cs%d?\n", dev_name(&spi->dev), spi->chip_select);
-               status = -ENODEV;
-               goto done;
-       }
-
        bits = spi->bits_per_word;
        if (t != NULL && t->bits_per_word)
                bits = t->bits_per_word;