spi: convert drivers to use bits_per_word_mask

Fill in the recently added spi_master.bits_per_word_mask field in as
many drivers as possible. Make related cleanups, such as removing any
redundant error-checking, or empty setup callbacks.

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 2 insertions, 11 deletions

diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 86d2158946bb..6246fb455774 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -857,12 +857,6 @@ static int omap2_mcspi_setup(struct spi_device *spi)
         struct omap2_mcspi_dma  *mcspi_dma;
         struct omap2_mcspi_cs   *cs = spi->controller_state;
 
-        if (spi->bits_per_word < 4 || spi->bits_per_word > 32) {
-                dev_dbg(&spi->dev, "setup: unsupported %d bit words\n",
-                        spi->bits_per_word);
-                return -EINVAL;
-        }
-
         mcspi_dma = &mcspi->dma_channels[spi->chip_select];
 
         if (!cs) {
@@ -1072,10 +1066,7 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master,
                 unsigned        len = t->len;
 
                 if (t->speed_hz > OMAP2_MCSPI_MAX_FREQ
-                                || (len && !(rx_buf || tx_buf))
-                                || (t->bits_per_word &&
-                                        (  t->bits_per_word < 4
-                                           || t->bits_per_word > 32))) {
+                                || (len && !(rx_buf || tx_buf))) {
                         dev_dbg(mcspi->dev, "transfer: %d Hz, %d %s%s, %d bpw\n",
                                         t->speed_hz,
                                         len,
@@ -1196,7 +1187,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
 
         /* the spi->mode bits understood by this driver: */
         master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
-
+        master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
         master->setup = omap2_mcspi_setup;
         master->prepare_transfer_hardware = omap2_prepare_transfer;
         master->unprepare_transfer_hardware = omap2_unprepare_transfer;