Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/init', 'spi/topic/mpc512x...

[cascardo/linux.git] / drivers / spi / spi-mpc52xx.c

diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c
index f573c3c..aac2a5d 100644 (file)
--- a/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@ -356,20 +356,6 @@ static void mpc52xx_spi_wq(struct work_struct *work)
  * spi_master ops
  */
 
-static int mpc52xx_spi_setup(struct spi_device *spi)
-{
-       if (spi->bits_per_word % 8)
-               return -EINVAL;
-
-       if (spi->mode & ~(SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST))
-               return -EINVAL;
-
-       if (spi->chip_select >= spi->master->num_chipselect)
-               return -EINVAL;
-
-       return 0;
-}
-
 static int mpc52xx_spi_transfer(struct spi_device *spi, struct spi_message *m)
 {
        struct mpc52xx_spi *ms = spi_master_get_devdata(spi->master);
@@ -432,9 +418,9 @@ static int mpc52xx_spi_probe(struct platform_device *op)
                goto err_alloc;
        }
 
-       master->setup = mpc52xx_spi_setup;
        master->transfer = mpc52xx_spi_transfer;
        master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST;
+       master->bits_per_word_mask = SPI_BPW_MASK(8);
        master->dev.of_node = op->dev.of_node;
 
        platform_set_drvdata(op, master);