Introduce console_platform_driver() macro and use it for serial drivers

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

17 files changed, 18 insertions, 133 deletions

diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c
index e82218a3ad..bab72990df 100644
--- a/drivers/serial/arm_dcc.c
+++ b/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);
diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c
index 6beae25f1e..89c141eafe 100644
--- a/drivers/serial/atmel.c
+++ b/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);
diff --git a/drivers/serial/linux_console.c b/drivers/serial/linux_console.c
index 4a99e961da..7ded091790 100644
--- a/drivers/serial/linux_console.c
+++ b/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);
diff --git a/drivers/serial/serial_altera.c b/drivers/serial/serial_altera.c
index 013b32c64b..7ff38d7f1d 100644
--- a/drivers/serial/serial_altera.c
+++ b/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);
diff --git a/drivers/serial/serial_altera_jtag.c b/drivers/serial/serial_altera_jtag.c
index b83fcbd5af..edc3c768dd 100644
--- a/drivers/serial/serial_altera_jtag.c
+++ b/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);
diff --git a/drivers/serial/serial_auart.c b/drivers/serial/serial_auart.c
index fa2e04f447..7c179faf99 100644
--- a/drivers/serial/serial_auart.c
+++ b/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);
diff --git a/drivers/serial/serial_blackfin.c b/drivers/serial/serial_blackfin.c
index 2117b11705..7373a03775 100644
--- a/drivers/serial/serial_blackfin.c
+++ b/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);
diff --git a/drivers/serial/serial_clps711x.c b/drivers/serial/serial_clps711x.c
index 21d0b55d3a..c359741a59 100644
--- a/drivers/serial/serial_clps711x.c
+++ b/drivers/serial/serial_clps711x.c
@@ -149,9 +149,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);
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index 3f219aee52..8553c2e6af 100644
--- a/drivers/serial/serial_imx.c
+++ b/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);
diff --git a/drivers/serial/serial_mpc5xxx.c b/drivers/serial/serial_mpc5xxx.c
index 81eaf07269..532eea3e5f 100644
--- a/drivers/serial/serial_mpc5xxx.c
+++ b/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);
diff --git a/drivers/serial/serial_netx.c b/drivers/serial/serial_netx.c
index 2ad9cfa97d..037b9980ba 100644
--- a/drivers/serial/serial_netx.c
+++ b/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);
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index 0ea940d676..b7913aa3ce 100644
--- a/drivers/serial/serial_ns16550.c
+++ b/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);
diff --git a/drivers/serial/serial_omap4_usbboot.c b/drivers/serial/serial_omap4_usbboot.c
index f0a2fd1646..51b2d13003 100644
--- a/drivers/serial/serial_omap4_usbboot.c
+++ b/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);
diff --git a/drivers/serial/serial_pl010.c b/drivers/serial/serial_pl010.c
index 0526b00709..9158774de9 100644
--- a/drivers/serial/serial_pl010.c
+++ b/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);
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index 08f3d7fd0b..42355cedf2 100644
--- a/drivers/serial/serial_pxa.c
+++ b/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);
diff --git a/drivers/serial/serial_s3c.c b/drivers/serial/serial_s3c.c
index ed401ab5bd..cc7b33e101 100644
--- a/drivers/serial/serial_s3c.c
+++ b/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);
diff --git a/drivers/serial/stm-serial.c b/drivers/serial/stm-serial.c
index 3968892b8b..49ffb2c86a 100644
--- a/drivers/serial/stm-serial.c
+++ b/drivers/serial/stm-serial.c
@@ -187,11 +187,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);