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

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

diff --git a/drivers/spi/spi-octeon.c b/drivers/spi/spi-octeon.c
index 1ed2594..c5e2f71 100644 (file)
--- a/drivers/spi/spi-octeon.c
+++ b/drivers/spi/spi-octeon.c
@@ -11,7 +11,6 @@
 #include <linux/spi/spi.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/init.h>
 #include <linux/io.h>
 #include <linux/of.h>
 
@@ -201,8 +200,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 |