diff options
| -rw-r--r-- | drivers/eeprom/at25.c | 2 | ||||
| -rw-r--r-- | drivers/mci/mci_spi.c | 2 | ||||
| -rw-r--r-- | drivers/mfd/mc13xxx.c | 2 | ||||
| -rw-r--r-- | drivers/mfd/mc34708.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/devices/m25p80.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/devices/mtd_dataflash.c | 2 | ||||
| -rw-r--r-- | drivers/net/ksz8864rmn.c | 2 | ||||
| -rw-r--r-- | include/spi/spi.h | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/drivers/eeprom/at25.c b/drivers/eeprom/at25.c index 9bd7748c64..e2e6ef4a8e 100644 --- a/drivers/eeprom/at25.c +++ b/drivers/eeprom/at25.c @@ -307,7 +307,7 @@ static struct driver_d at25_driver = { static int at25_init(void) { - spi_register_driver(&at25_driver); + spi_driver_register(&at25_driver); return 0; } diff --git a/drivers/mci/mci_spi.c b/drivers/mci/mci_spi.c index 679a0e1e02..022e2603bf 100644 --- a/drivers/mci/mci_spi.c +++ b/drivers/mci/mci_spi.c @@ -446,7 +446,7 @@ static struct driver_d spi_mci_driver = { static int spi_mci_init_driver(void) { - spi_register_driver(&spi_mci_driver); + spi_driver_register(&spi_mci_driver); return 0; } diff --git a/drivers/mfd/mc13xxx.c b/drivers/mfd/mc13xxx.c index d6cf73cba8..359b118f54 100644 --- a/drivers/mfd/mc13xxx.c +++ b/drivers/mfd/mc13xxx.c @@ -375,7 +375,7 @@ static struct driver_d mc_spi_driver = { static int mc_spi_init(void) { - return spi_register_driver(&mc_spi_driver); + return spi_driver_register(&mc_spi_driver); } device_initcall(mc_spi_init); diff --git a/drivers/mfd/mc34708.c b/drivers/mfd/mc34708.c index b1166de6b8..fbd68913c8 100644 --- a/drivers/mfd/mc34708.c +++ b/drivers/mfd/mc34708.c @@ -294,7 +294,7 @@ static struct driver_d mc_spi_driver = { static int mc_spi_init(void) { - return spi_register_driver(&mc_spi_driver); + return spi_driver_register(&mc_spi_driver); } device_initcall(mc_spi_init); diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 2db6fff617..329349187b 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -954,7 +954,7 @@ static struct driver_d m25p80_driver = { static int m25p80_init(void) { - return spi_register_driver(&m25p80_driver); + return spi_driver_register(&m25p80_driver); } device_initcall(m25p80_init); diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index 3b7b9c6bdc..cfad8b1c17 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -878,7 +878,7 @@ static struct driver_d dataflash_driver = { static int dataflash_init(void) { - spi_register_driver(&dataflash_driver); + spi_driver_register(&dataflash_driver); return 0; } device_initcall(dataflash_init); diff --git a/drivers/net/ksz8864rmn.c b/drivers/net/ksz8864rmn.c index 5845960f6c..99274ece42 100644 --- a/drivers/net/ksz8864rmn.c +++ b/drivers/net/ksz8864rmn.c @@ -185,7 +185,7 @@ static struct driver_d micrel_switch_driver = { static int micrel_switch_init(void) { - spi_register_driver(&micrel_switch_driver); + spi_driver_register(&micrel_switch_driver); return 0; } device_initcall(micrel_switch_init); diff --git a/include/spi/spi.h b/include/spi/spi.h index fa76e9b59f..9bec566f03 100644 --- a/include/spi/spi.h +++ b/include/spi/spi.h @@ -436,7 +436,7 @@ extern struct bus_type spi_bus; struct spi_master *spi_get_master(int bus); -static inline int spi_register_driver(struct driver_d *drv) +static inline int spi_driver_register(struct driver_d *drv) { drv->bus = &spi_bus; return register_driver(drv); |