diff options
| -rw-r--r-- | drivers/eeprom/at25.c | 9 | ||||
| -rw-r--r-- | drivers/mci/mci_spi.c | 9 | ||||
| -rw-r--r-- | drivers/mfd/mc13xxx.c | 8 | ||||
| -rw-r--r-- | drivers/mfd/mc34708.c | 8 | ||||
| -rw-r--r-- | drivers/mtd/devices/m25p80.c | 7 | ||||
| -rw-r--r-- | drivers/mtd/devices/mtd_dataflash.c | 8 | ||||
| -rw-r--r-- | drivers/net/ksz8864rmn.c | 8 | ||||
| -rw-r--r-- | include/spi/spi.h | 3 |
8 files changed, 10 insertions, 50 deletions
diff --git a/drivers/eeprom/at25.c b/drivers/eeprom/at25.c index e2e6ef4a8e..68b4710aae 100644 --- a/drivers/eeprom/at25.c +++ b/drivers/eeprom/at25.c @@ -304,11 +304,4 @@ static struct driver_d at25_driver = { .name = DRIVERNAME, .probe = at25_probe, }; - -static int at25_init(void) -{ - spi_driver_register(&at25_driver); - return 0; -} - -device_initcall(at25_init); +device_spi_driver(at25_driver); diff --git a/drivers/mci/mci_spi.c b/drivers/mci/mci_spi.c index 022e2603bf..011947c8c1 100644 --- a/drivers/mci/mci_spi.c +++ b/drivers/mci/mci_spi.c @@ -443,11 +443,4 @@ static struct driver_d spi_mci_driver = { .name = "spi_mci", .probe = spi_mci_probe, }; - -static int spi_mci_init_driver(void) -{ - spi_driver_register(&spi_mci_driver); - return 0; -} - -device_initcall(spi_mci_init_driver); +device_spi_driver(spi_mci_driver); diff --git a/drivers/mfd/mc13xxx.c b/drivers/mfd/mc13xxx.c index 91c874fcac..466a11cb40 100644 --- a/drivers/mfd/mc13xxx.c +++ b/drivers/mfd/mc13xxx.c @@ -372,11 +372,5 @@ static struct driver_d mc_spi_driver = { .probe = mc_spi_probe, .of_compatible = DRV_OF_COMPAT(mc13892_dt_ids), }; - -static int mc_spi_init(void) -{ - return spi_driver_register(&mc_spi_driver); -} - -device_initcall(mc_spi_init); +device_spi_driver(mc_spi_driver); #endif diff --git a/drivers/mfd/mc34708.c b/drivers/mfd/mc34708.c index 63db1e1fe5..6fea2e2143 100644 --- a/drivers/mfd/mc34708.c +++ b/drivers/mfd/mc34708.c @@ -291,11 +291,5 @@ static struct driver_d mc_spi_driver = { .name = "mc34708-spi", .probe = mc_spi_probe, }; - -static int mc_spi_init(void) -{ - return spi_driver_register(&mc_spi_driver); -} - -device_initcall(mc_spi_init); +device_spi_driver(mc_spi_driver); #endif diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 329349187b..048d1783dc 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -951,12 +951,7 @@ static struct driver_d m25p80_driver = { .name = "m25p80", .probe = m25p_probe, }; - -static int m25p80_init(void) -{ - return spi_driver_register(&m25p80_driver); -} -device_initcall(m25p80_init); +device_spi_driver(m25p80_driver); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Mike Lavender"); diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index cfad8b1c17..ddab6bbb79 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -875,13 +875,7 @@ static struct driver_d dataflash_driver = { .name = "mtd_dataflash", .probe = dataflash_probe, }; - -static int dataflash_init(void) -{ - spi_driver_register(&dataflash_driver); - return 0; -} -device_initcall(dataflash_init); +device_spi_driver(dataflash_driver); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Andrew Victor, David Brownell"); diff --git a/drivers/net/ksz8864rmn.c b/drivers/net/ksz8864rmn.c index 99274ece42..af3c12489c 100644 --- a/drivers/net/ksz8864rmn.c +++ b/drivers/net/ksz8864rmn.c @@ -182,10 +182,4 @@ static struct driver_d micrel_switch_driver = { .name = "ksz8864rmn", .probe = micrel_switch_probe, }; - -static int micrel_switch_init(void) -{ - spi_driver_register(&micrel_switch_driver); - return 0; -} -device_initcall(micrel_switch_init); +device_spi_driver(micrel_switch_driver); diff --git a/include/spi/spi.h b/include/spi/spi.h index 9bec566f03..3da13e85ec 100644 --- a/include/spi/spi.h +++ b/include/spi/spi.h @@ -442,6 +442,9 @@ static inline int spi_driver_register(struct driver_d *drv) return register_driver(drv); } +#define device_spi_driver(drv) \ + register_driver_macro(device,spi,drv) + void spi_of_register_slaves(struct spi_master *master, struct device_node *node); #endif /* __INCLUDE_SPI_H */ |