1 files changed, 1 insertions, 27 deletions

diff --git a/drivers/spi/spi-octeon.c b/drivers/spi/spi-octeon.c
index c7c772a09bb7..5f28ddbe4f7e 100644
--- a/drivers/spi/spi-octeon.c
+++ b/drivers/spi/spi-octeon.c
@@ -161,19 +161,6 @@ static int octeon_spi_do_transfer(struct octeon_spi *p,
         return xfer->len;
 }
 
-static int octeon_spi_validate_bpw(struct spi_device *spi, u32 speed)
-{
-        switch (speed) {
-        case 8:
-                break;
-        default:
-                dev_err(&spi->dev, "Error: %d bits per word not supported\n",
-                        speed);
-                return -EINVAL;
-        }
-        return 0;
-}
-
 static int octeon_spi_transfer_one_message(struct spi_master *master,
                                            struct spi_message *msg)
 {
@@ -192,15 +179,6 @@ static int octeon_spi_transfer_one_message(struct spi_master *master,
         }
 
         list_for_each_entry(xfer, &msg->transfers, transfer_list) {
-                if (xfer->bits_per_word) {
-                        status = octeon_spi_validate_bpw(msg->spi,
-                                                         xfer->bits_per_word);
-                        if (status)
-                                goto err;
-                }
-        }
-
-        list_for_each_entry(xfer, &msg->transfers, transfer_list) {
                 bool last_xfer = &xfer->transfer_list == msg->transfers.prev;
                 int r = octeon_spi_do_transfer(p, msg, xfer, last_xfer);
                 if (r < 0) {
@@ -231,14 +209,9 @@ static struct octeon_spi_setup *octeon_spi_new_setup(struct spi_device *spi)
 
 static int octeon_spi_setup(struct spi_device *spi)
 {
-        int r;
         struct octeon_spi_setup *new_setup;
         struct octeon_spi_setup *old_setup = spi_get_ctldata(spi);
 
-        r = octeon_spi_validate_bpw(spi, spi->bits_per_word);
-        if (r)
-                return r;
-
         new_setup = octeon_spi_new_setup(spi);
         if (!new_setup)
                 return -ENOMEM;
@@ -296,6 +269,7 @@ static int octeon_spi_probe(struct platform_device *pdev)
         master->setup = octeon_spi_setup;
         master->cleanup = octeon_spi_cleanup;
         master->transfer_one_message = octeon_spi_transfer_one_message;
+        master->bits_per_word_mask = SPI_BPW_MASK(8);
 
         master->dev.of_node = pdev->dev.of_node;
         err = spi_register_master(master);