Merge branch 'for-next/device-driver-macros'

drivers/eeprom/at24.c

@@ -454,7 +454,7 @@ static struct driver_d at24_driver = {
 
 static int at24_init(void)
 {
-	i2c_register_driver(&at24_driver);
+	i2c_driver_register(&at24_driver);
 	return 0;
 }
 device_initcall(at24_init);

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_register_driver(&at25_driver);
-	return 0;
-}
-
-device_initcall(at25_init);
+device_spi_driver(at25_driver);

drivers/input/qt1070.c

@@ -291,7 +291,7 @@ static struct driver_d qt1070_driver = {
 
 static int qt1070_init(void)
 {
-	i2c_register_driver(&qt1070_driver);
+	i2c_driver_register(&qt1070_driver);
 	return 0;
 }
 device_initcall(qt1070_init);

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_register_driver(&spi_mci_driver);
-	return 0;
-}
-
-device_initcall(spi_mci_init_driver);
+device_spi_driver(spi_mci_driver);

drivers/mfd/lp3972.c

@@ -99,7 +99,7 @@ static struct driver_d lp_driver = {
 
 static int lp_init(void)
 {
-	i2c_register_driver(&lp_driver);
+	i2c_driver_register(&lp_driver);
 	return 0;
 }
 

drivers/mfd/mc13xxx.c

@@ -356,7 +356,7 @@ static struct driver_d mc_i2c_driver = {
 
 static int mc_i2c_init(void)
 {
-	return i2c_register_driver(&mc_i2c_driver);
+	return i2c_driver_register(&mc_i2c_driver);
 }
 device_initcall(mc_i2c_init);
 #endif
@@ -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_register_driver(&mc_spi_driver);
-}
-
-device_initcall(mc_spi_init);
+device_spi_driver(mc_spi_driver);
 #endif

drivers/mfd/mc34704.c

@@ -130,7 +130,7 @@ static struct driver_d mc34704_driver = {
 
 static int mc34704_init(void)
 {
-	i2c_register_driver(&mc34704_driver);
+	i2c_driver_register(&mc34704_driver);
 	return 0;
 }
 device_initcall(mc34704_init);

drivers/mfd/mc34708.c

@@ -275,7 +275,7 @@ static struct driver_d mc_i2c_driver = {
 
 static int mc_i2c_init(void)
 {
-	return i2c_register_driver(&mc_i2c_driver);
+	return i2c_driver_register(&mc_i2c_driver);
 }
 
 device_initcall(mc_i2c_init);
@@ -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_register_driver(&mc_spi_driver);
-}
-
-device_initcall(mc_spi_init);
+device_spi_driver(mc_spi_driver);
 #endif

drivers/mfd/mc9sdz60.c

@@ -142,7 +142,7 @@ static struct driver_d mc_driver = {
 
 static int mc_init(void)
 {
-        i2c_register_driver(&mc_driver);
+        i2c_driver_register(&mc_driver);
         return 0;
 }
 

drivers/mfd/stmpe-i2c.c

@@ -147,7 +147,7 @@ static struct driver_d stmpe_driver = {
 
 static int stmpe_init(void)
 {
-        i2c_register_driver(&stmpe_driver);
+        i2c_driver_register(&stmpe_driver);
         return 0;
 }
 

drivers/mfd/twl4030.c

@@ -53,7 +53,7 @@ static struct driver_d twl_driver = {
 
 static int twl_init(void)
 {
-	i2c_register_driver(&twl_driver);
+	i2c_driver_register(&twl_driver);
 	return 0;
 }
 

drivers/mfd/twl6030.c

@@ -70,7 +70,7 @@ static struct driver_d twl_driver = {
 
 static int twl_init(void)
 {
-	i2c_register_driver(&twl_driver);
+	i2c_driver_register(&twl_driver);
 	return 0;
 }
 

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_register_driver(&m25p80_driver);
-}
-device_initcall(m25p80_init);
+device_spi_driver(m25p80_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Mike Lavender");

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_register_driver(&dataflash_driver);
-	return 0;
-}
-device_initcall(dataflash_init);
+device_spi_driver(dataflash_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Andrew Victor, David Brownell");

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_register_driver(&micrel_switch_driver);
-	return 0;
-}
-device_initcall(micrel_switch_init);
+device_spi_driver(micrel_switch_driver);

drivers/net/xgmac.c

@@ -731,10 +731,4 @@ static struct driver_d hb_xgmac_driver = {
 	.probe = hb_xgmac_probe,
 	.of_compatible = DRV_OF_COMPAT(xgmac_dt_ids),
 };
-
-static int hb_xgmac_driver_init(void)
-{
-	debug("%s\n", __func__);
-	return platform_driver_register(&hb_xgmac_driver);
-}
-device_initcall(hb_xgmac_driver_init);
+device_platform_driver(hb_xgmac_driver);

drivers/serial/arm_dcc.c

@@ -149,6 +149,7 @@ static struct driver_d arm_dcc_driver = {
 	.name	= "arm_dcc",
 	.probe	= arm_dcc_probe,
 };
+console_platform_driver(arm_dcc_driver);
 
 static struct device_d arm_dcc_device = {
 	.id	= DEVICE_ID_DYNAMIC,
@@ -157,9 +158,6 @@ static struct device_d arm_dcc_device = {
 
 static int arm_dcc_init(void)
 {
-	platform_device_register(&arm_dcc_device);
-	platform_driver_register(&arm_dcc_driver);
-	return 0;
+	return platform_device_register(&arm_dcc_device);
 }
-
 console_initcall(arm_dcc_init);

drivers/serial/atmel.c

@@ -418,11 +418,4 @@ static struct driver_d atmel_serial_driver = {
         .name  = "atmel_usart",
         .probe = atmel_serial_probe,
 };
-
-static int atmel_serial_init(void)
-{
-	platform_driver_register(&atmel_serial_driver);
-	return 0;
-}
-
-console_initcall(atmel_serial_init);
+console_platform_driver(atmel_serial_driver);

drivers/serial/linux_console.c

@@ -78,11 +78,4 @@ static struct driver_d linux_console_driver = {
         .name  = "console",
         .probe = linux_console_probe,
 };
-
-static int console_init(void)
-{
-	return platform_driver_register(&linux_console_driver);
-}
-
-console_initcall(console_init);
-
+console_platform_driver(linux_console_driver);

drivers/serial/serial_altera.c

@@ -101,11 +101,4 @@ static struct driver_d altera_serial_driver = {
 	.name = "altera_serial",
 	.probe = altera_serial_probe,
 };
-
-static int altera_serial_init(void)
-{
-	return platform_driver_register(&altera_serial_driver);
-}
-
-console_initcall(altera_serial_init);
-
+console_platform_driver(altera_serial_driver);

drivers/serial/serial_altera_jtag.c

@@ -106,10 +106,4 @@ static struct driver_d altera_serial_jtag_driver = {
 	.name = "altera_serial_jtag",
 	.probe = altera_serial_jtag_probe,
 };
-
-static int altera_serial_jtag_init(void)
-{
-	return platform_driver_register(&altera_serial_jtag_driver);
-}
-
-console_initcall(altera_serial_jtag_init);
+console_platform_driver(altera_serial_jtag_driver);

drivers/serial/serial_auart.c

@@ -228,11 +228,4 @@ static struct driver_d auart_serial_driver = {
 	.probe = auart_serial_probe,
 	.remove = auart_serial_remove,
 };
-
-static int auart_serial_init(void)
-{
-	platform_driver_register(&auart_serial_driver);
-	return 0;
-}
-
-console_initcall(auart_serial_init);
+console_platform_driver(auart_serial_driver);

drivers/serial/serial_blackfin.c

@@ -130,12 +130,4 @@ static struct driver_d blackfin_serial_driver = {
         .name  = "blackfin_serial",
         .probe = blackfin_serial_probe,
 };
-
-static int blackfin_serial_init(void)
-{
-	platform_driver_register(&blackfin_serial_driver);
-	return 0;
-}
-
-console_initcall(blackfin_serial_init);
-
+console_platform_driver(blackfin_serial_driver);

drivers/serial/serial_clps711x.c

@@ -156,9 +156,4 @@ static struct driver_d clps711x_driver = {
 	.probe	= clps711x_probe,
 	.remove	= clps711x_remove,
 };
-
-static int clps711x_init(void)
-{
-	return platform_driver_register(&clps711x_driver);
-}
-console_initcall(clps711x_init);
+console_platform_driver(clps711x_driver);

drivers/serial/serial_imx.c

@@ -397,11 +397,4 @@ static struct driver_d imx_serial_driver = {
 	.of_compatible = DRV_OF_COMPAT(imx_serial_dt_ids),
 	.id_table = imx_serial_ids,
 };
-
-static int imx_serial_init(void)
-{
-	platform_driver_register(&imx_serial_driver);
-	return 0;
-}
-
-console_initcall(imx_serial_init);
+console_platform_driver(imx_serial_driver);

drivers/serial/serial_mpc5xxx.c

@@ -166,11 +166,4 @@ static struct driver_d mpc5xxx_serial_driver = {
         .name  = "mpc5xxx_serial",
         .probe = mpc5xxx_serial_probe,
 };
-
-static int mpc5xxx_serial_register(void)
-{
-	platform_driver_register(&mpc5xxx_serial_driver);
-	return 0;
-}
-
-console_initcall(mpc5xxx_serial_register);
+console_platform_driver(mpc5xxx_serial_driver);

drivers/serial/serial_netx.c

@@ -155,12 +155,4 @@ static struct driver_d netx_serial_driver = {
         .name  = "netx_serial",
         .probe = netx_serial_probe,
 };
-
-static int netx_serial_init(void)
-{
-	platform_driver_register(&netx_serial_driver);
-	return 0;
-}
-
-console_initcall(netx_serial_init);
-
+console_platform_driver(netx_serial_driver);

drivers/serial/serial_ns16550.c

@@ -262,15 +262,4 @@ static struct driver_d ns16550_serial_driver = {
 	.name = "ns16550_serial",
 	.probe = ns16550_probe,
 };
-
-/**
- * @brief driver initialization function
- *
- * @return result of platform_driver_register
- */
-static int ns16550_serial_init(void)
-{
-	return platform_driver_register(&ns16550_serial_driver);
-}
-
-console_initcall(ns16550_serial_init);
+console_platform_driver(ns16550_serial_driver);

drivers/serial/serial_omap4_usbboot.c

@@ -75,9 +75,4 @@ static struct driver_d serial_omap4_usbboot_driver = {
 	.name = "serial_omap4_usbboot",
 	.probe = serial_omap4_usbboot_probe,
 };
-
-static int serial_omap4_usbboot_init(void)
-{
-	return platform_driver_register(&serial_omap4_usbboot_driver);
-}
-console_initcall(serial_omap4_usbboot_init);
+console_platform_driver(serial_omap4_usbboot_driver);

drivers/serial/serial_pl010.c

@@ -157,12 +157,4 @@ static struct driver_d pl010_driver = {
 	.name  = "pl010_serial",
 	.probe = pl010_probe,
 };
-
-static int pl010_init(void)
-{
-	platform_driver_register(&pl010_driver);
-
-	return 0;
-}
-
-console_initcall(pl010_init);
+console_platform_driver(pl010_driver);

drivers/serial/serial_pxa.c

@@ -195,10 +195,4 @@ static struct driver_d pxa_serial_driver = {
 	.probe = pxa_serial_probe,
 	.remove = pxa_serial_remove,
 };
-
-static int pxa_serial_init(void)
-{
-	return platform_driver_register(&pxa_serial_driver);
-}
-
-console_initcall(pxa_serial_init);
+console_platform_driver(pxa_serial_driver);

drivers/serial/serial_s3c.c

@@ -213,11 +213,4 @@ static struct driver_d s3c_serial_driver = {
 	.probe  = s3c_serial_probe,
 	.remove = s3c_serial_remove,
 };
-
-static int s3c_serial_init(void)
-{
-	platform_driver_register(&s3c_serial_driver);
-	return 0;
-}
-
-console_initcall(s3c_serial_init);
+console_platform_driver(s3c_serial_driver);

drivers/serial/stm-serial.c

@@ -188,11 +188,4 @@ static struct driver_d stm_serial_driver = {
         .probe  = stm_serial_probe,
 	.remove = stm_serial_remove,
 };
-
-static int stm_serial_init(void)
-{
-	platform_driver_register(&stm_serial_driver);
-	return 0;
-}
-
-console_initcall(stm_serial_init);
+console_platform_driver(stm_serial_driver);

drivers/spi/mxs_spi.c

@@ -276,13 +276,7 @@ static struct driver_d mxs_spi_driver = {
 	.name  = "mxs_spi",
 	.probe = mxs_spi_probe,
 };
-
-static int __init mxs_spi_init(void)
-{
-	return platform_driver_register(&mxs_spi_driver);
-}
-
-device_initcall(mxs_spi_init);
+device_platform_driver(mxs_spi_driver);
 
 MODULE_AUTHOR("Denx Software Engeneering and Michael Grzeschik");
 MODULE_DESCRIPTION("MXS SPI driver");

include/driver.h

@@ -395,16 +395,21 @@ extern struct bus_type platform_bus;
 
 int platform_driver_register(struct driver_d *drv);
 
-/* device_platform_driver() - Helper macro for drivers that don't do
+/* register_driver_macro() - Helper macro for drivers that don't do
  * anything special in module registration. This eliminates a lot of
  * boilerplate. Each module may only use this macro once.
  */
-#define device_platform_driver(drv)			\
-	static int __init drv ## _register(void)	\
+#define register_driver_macro(level,bus,drv)		\
+	static int __init drv##_register(void)		\
 	{						\
-		return platform_driver_register(&drv);	\
+		return bus##_driver_register(&drv);	\
 	}						\
-	device_initcall(drv ## _register)
+	level##_initcall(drv##_register)
+
+#define device_platform_driver(drv)	\
+	register_driver_macro(device,platform,drv)
+#define console_platform_driver(drv)	\
+	register_driver_macro(console,platform,drv)
 
 int platform_device_register(struct device_d *new_device);
 

include/i2c/i2c.h

@@ -151,7 +151,7 @@ extern int i2c_write_reg(struct i2c_client *client, u32 addr, const u8 *buf, u16
 
 extern struct bus_type i2c_bus;
 
-static inline int i2c_register_driver(struct driver_d *drv)
+static inline int i2c_driver_register(struct driver_d *drv)
 {
 	drv->bus = &i2c_bus;
 	return register_driver(drv);

include/spi/spi.h

@@ -436,12 +436,15 @@ 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);
 }
 
+#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 */