These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / spi / spi-bcm53xx.c

diff --git a/kernel/drivers/spi/spi-bcm53xx.c b/kernel/drivers/spi/spi-bcm53xx.c
index 1520554..cc3f938 100644 (file)
--- a/kernel/drivers/spi/spi-bcm53xx.c
+++ b/kernel/drivers/spi/spi-bcm53xx.c
@@ -247,28 +247,19 @@ static int bcm53xxspi_bcma_probe(struct bcma_device *core)
        if (err) {
                spi_master_put(master);
                bcma_set_drvdata(core, NULL);
-               goto out;
+               return err;
        }
 
        /* Broadcom SoCs (at least with the CC rev 42) use SPI for flash only */
        spi_new_device(master, &bcm53xx_info);
 
-out:
-       return err;
-}
-
-static void bcm53xxspi_bcma_remove(struct bcma_device *core)
-{
-       struct bcm53xxspi *b53spi = bcma_get_drvdata(core);
-
-       spi_unregister_master(b53spi->master);
+       return 0;
 }
 
 static struct bcma_driver bcm53xxspi_bcma_driver = {
        .name           = KBUILD_MODNAME,
        .id_table       = bcm53xxspi_bcma_tbl,
        .probe          = bcm53xxspi_bcma_probe,
-       .remove         = bcm53xxspi_bcma_remove,
 };
 
 /**************************************************