spi: By default setup spi_masters with 1 chipselect and dynamics bus number

Trivial simplification.  Instead of requiring spi master drivers to
always set the bus number (even when a dynamic number is desired),
this patch modifies spi_alloc_master() to initialize num_chipselect to
1 (because there will always be at least one CS) and bus_num to -1 for
dynamic allocation.  This simplifies the code needed to be written for
drivers.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

6 files changed, 2 insertions, 13 deletions

diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index acc88b4d2869..249077e5cc48 100644
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -216,9 +216,6 @@ static __devinit int ath79_spi_probe(struct platform_device *pdev)
         if (pdata) {
                 master->bus_num = pdata->bus_num;
                 master->num_chipselect = pdata->num_chipselect;
-        } else {
-                master->bus_num = -1;
-                master->num_chipselect = 1;
         }
 
         sp->bitbang.master = spi_master_get(master);
diff --git a/drivers/spi/spi-lm70llp.c b/drivers/spi/spi-lm70llp.c
index 933eb9d9ddd4..0759b5db9883 100644
--- a/drivers/spi/spi-lm70llp.c
+++ b/drivers/spi/spi-lm70llp.c
@@ -219,9 +219,6 @@ static void spi_lm70llp_attach(struct parport *p)
         }
         pp = spi_master_get_devdata(master);
 
-        master->bus_num = -1;   /* dynamic alloc of a bus number */
-        master->num_chipselect = 1;
-
         /*
          * SPI and bitbang hookup.
          */
diff --git a/drivers/spi/spi-mpc52xx.c b/drivers/spi/spi-mpc52xx.c
index 57633d963456..cb3a3830b0a5 100644
--- a/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@ -433,7 +433,6 @@ static int __devinit mpc52xx_spi_probe(struct platform_device *op)
                 goto err_alloc;
         }
 
-        master->bus_num = -1;
         master->setup = mpc52xx_spi_setup;
         master->transfer = mpc52xx_spi_transfer;
         master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST;
@@ -479,8 +478,6 @@ static int __devinit mpc52xx_spi_probe(struct platform_device *op)
                         gpio_direction_output(gpio_cs, 1);
                         ms->gpio_cs[i] = gpio_cs;
                 }
-        } else {
-                master->num_chipselect = 1;
         }
 
         spin_lock_init(&ms->lock);
diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c
index d95d307a1100..75ac9d48ef46 100644
--- a/drivers/spi/spi-ppc4xx.c
+++ b/drivers/spi/spi-ppc4xx.c
@@ -466,9 +466,6 @@ static int __init spi_ppc4xx_of_probe(struct platform_device *op)
         bbp->master->setup = spi_ppc4xx_setup;
         bbp->master->cleanup = spi_ppc4xx_cleanup;
 
-        /* Allocate bus num dynamically. */
-        bbp->master->bus_num = -1;
-
         /* the spi->mode bits understood by this driver: */
         bbp->master->mode_bits =
                 SPI_CPHA | SPI_CPOL | SPI_CS_HIGH | SPI_LSB_FIRST;
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index 77c4562ac9d3..cd56dcf46320 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -1438,7 +1438,6 @@ static int __devinit pch_spi_pd_probe(struct platform_device *plat_dev)
                 plat_dev->id, data->io_remap_addr);
 
         /* initialize members of SPI master */
-        master->bus_num = -1;
         master->num_chipselect = PCH_MAX_CS;
         master->setup = pch_spi_setup;
         master->transfer = pch_spi_transfer;
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 2d65b1684cdc..1041cb83d67a 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -936,6 +936,8 @@ struct spi_master *spi_alloc_master(struct device *dev, unsigned size)
                 return NULL;
 
         device_initialize(&master->dev);
+        master->bus_num = -1;
+        master->num_chipselect = 1;
         master->dev.class = &spi_master_class;
         master->dev.parent = get_device(dev);
         spi_master_set_devdata(master, &master[1]);