9 files changed, 0 insertions, 14 deletions

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index 8a89dd1f2654..69167456ec1e 100644
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -315,7 +315,6 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
 
         master->mode_bits = BCM2835_SPI_MODE_BITS;
         master->bits_per_word_mask = SPI_BPW_MASK(8);
-        master->bus_num = -1;
         master->num_chipselect = 3;
         master->transfer_one_message = bcm2835_spi_transfer_one;
         master->dev.of_node = pdev->dev.of_node;
diff --git a/drivers/spi/spi-efm32.c b/drivers/spi/spi-efm32.c
index d4d3cc534792..7199d2fd2b0b 100644
--- a/drivers/spi/spi-efm32.c
+++ b/drivers/spi/spi-efm32.c
@@ -308,10 +308,6 @@ static int efm32_spi_probe_dt(struct platform_device *pdev,
         }
 
         ddata->pdata.location = location;
-
-        /* spi core takes care about the bus number using an alias */
-        master->bus_num = -1;
-
         return 0;
 }
 
diff --git a/drivers/spi/spi-falcon.c b/drivers/spi/spi-falcon.c
index dd5bd468e962..ccd257b6e2a8 100644
--- a/drivers/spi/spi-falcon.c
+++ b/drivers/spi/spi-falcon.c
@@ -422,9 +422,7 @@ static int falcon_sflash_probe(struct platform_device *pdev)
         priv->master = master;
 
         master->mode_bits = SPI_MODE_3;
-        master->num_chipselect = 1;
         master->flags = SPI_MASTER_HALF_DUPLEX;
-        master->bus_num = -1;
         master->setup = falcon_sflash_setup;
         master->prepare_transfer_hardware = falcon_sflash_prepare_xfer;
         master->transfer_one_message = falcon_sflash_xfer_one;
diff --git a/drivers/spi/spi-octeon.c b/drivers/spi/spi-octeon.c
index 67249a48b391..e31f6d833951 100644
--- a/drivers/spi/spi-octeon.c
+++ b/drivers/spi/spi-octeon.c
@@ -257,8 +257,6 @@ static int octeon_spi_probe(struct platform_device *pdev)
         p->register_base = (u64)devm_ioremap(&pdev->dev, res_mem->start,
                                              resource_size(res_mem));
 
-        /* Dynamic bus numbering */
-        master->bus_num = -1;
         master->num_chipselect = 4;
         master->mode_bits = SPI_CPHA |
                             SPI_CPOL |
diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c
index 82d2f922ffa0..755d7cc9e72f 100644
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@ -298,7 +298,6 @@ static int hspi_probe(struct platform_device *pdev)
 
         pm_runtime_enable(&pdev->dev);
 
-        master->num_chipselect  = 1;
         master->bus_num         = pdev->id;
         master->setup           = hspi_setup;
         master->cleanup         = hspi_cleanup;
diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index 413c71843492..1e399ad3cc49 100644
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -1058,7 +1058,6 @@ static int tegra_spi_probe(struct platform_device *pdev)
         master->setup = tegra_spi_setup;
         master->transfer_one_message = tegra_spi_transfer_one_message;
         master->num_chipselect = MAX_CHIP_SELECT;
-        master->bus_num = -1;
         master->auto_runtime_pm = true;
 
         tspi->master = master;
diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c
index 08794977f21a..44e00dba1e79 100644
--- a/drivers/spi/spi-tegra20-sflash.c
+++ b/drivers/spi/spi-tegra20-sflash.c
@@ -471,7 +471,6 @@ static int tegra_sflash_probe(struct platform_device *pdev)
         master->transfer_one_message = tegra_sflash_transfer_one_message;
         master->auto_runtime_pm = true;
         master->num_chipselect = MAX_CHIP_SELECT;
-        master->bus_num = -1;
 
         platform_set_drvdata(pdev, master);
         tsd = spi_master_get_devdata(master);
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index be3a069879c3..b06ea31c1699 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -1053,7 +1053,6 @@ static int tegra_slink_probe(struct platform_device *pdev)
         master->unprepare_message = tegra_slink_unprepare_message;
         master->auto_runtime_pm = true;
         master->num_chipselect = MAX_CHIP_SELECT;
-        master->bus_num = -1;
 
         platform_set_drvdata(pdev, master);
         tspi = spi_master_get_devdata(master);
diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c
index 3d09265b5133..de9920e9d3f8 100644
--- a/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@ -429,7 +429,6 @@ 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;