1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c
index 3d09265b5133..49ddfc7f12b1 100644
--- a/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@ -429,13 +429,13 @@ static int ti_qspi_probe(struct platform_device *pdev)
 
         master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_RX_DUAL | SPI_RX_QUAD;
 
-        master->bus_num = -1;
         master->flags = SPI_MASTER_HALF_DUPLEX;
         master->setup = ti_qspi_setup;
         master->auto_runtime_pm = true;
         master->transfer_one_message = ti_qspi_start_transfer_one;
         master->dev.of_node = pdev->dev.of_node;
-        master->bits_per_word_mask = BIT(32 - 1) | BIT(16 - 1) | BIT(8 - 1);
+        master->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(16) |
+                                     SPI_BPW_MASK(8);
 
         if (!of_property_read_u32(np, "num-cs", &num_cs))
                 master->num_chipselect = num_cs;