Commit 524ed1c7 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] console_initcall() return type

Fix return type (must be int, not void) of *_console_init() after introduction
of console_initcall() in 2.5.x.
parent 1de089a0
...@@ -2305,9 +2305,10 @@ static struct console sercons = { ...@@ -2305,9 +2305,10 @@ static struct console sercons = {
/* /*
* Register console. * Register console.
*/ */
static void __init amiserial_console_init(void) static int __init amiserial_console_init(void)
{ {
register_console(&sercons); register_console(&sercons);
return 0;
} }
console_initcall(amiserial_console_init); console_initcall(amiserial_console_init);
#endif #endif
......
...@@ -75,7 +75,7 @@ __initcall(rs_init); ...@@ -75,7 +75,7 @@ __initcall(rs_init);
/* serial_console_init handles the special case of starting /* serial_console_init handles the special case of starting
* up the console on the serial port * up the console on the serial port
*/ */
static void __init decserial_console_init(void) static int __init decserial_console_init(void)
{ {
#if defined(CONFIG_ZS) && defined(CONFIG_DZ) #if defined(CONFIG_ZS) && defined(CONFIG_DZ)
if (IOASIC) if (IOASIC)
...@@ -93,6 +93,7 @@ static void __init decserial_console_init(void) ...@@ -93,6 +93,7 @@ static void __init decserial_console_init(void)
#endif #endif
#endif #endif
return 0;
} }
console_initcall(decserial_console_init); console_initcall(decserial_console_init);
......
...@@ -2836,7 +2836,7 @@ static struct console sercons = { ...@@ -2836,7 +2836,7 @@ static struct console sercons = {
}; };
static void __init serial167_console_init(void) static int __init serial167_console_init(void)
{ {
if (vme_brdtype == VME_TYPE_MVME166 || if (vme_brdtype == VME_TYPE_MVME166 ||
vme_brdtype == VME_TYPE_MVME167 || vme_brdtype == VME_TYPE_MVME167 ||
...@@ -2844,6 +2844,7 @@ static void __init serial167_console_init(void) ...@@ -2844,6 +2844,7 @@ static void __init serial167_console_init(void)
mvme167_serial_console_setup(0); mvme167_serial_console_setup(0);
register_console(&sercons); register_console(&sercons);
} }
return 0;
} }
console_initcall(serial167_console_init); console_initcall(serial167_console_init);
......
...@@ -1054,9 +1054,10 @@ static struct console sercons = { ...@@ -1054,9 +1054,10 @@ static struct console sercons = {
.index = -1 .index = -1
}; };
static void __init tx3912_console_init(void) static int __init tx3912_console_init(void)
{ {
register_console(&sercons); register_console(&sercons);
return 0;
} }
console_initcall(tx3912_console_init); console_initcall(tx3912_console_init);
......
...@@ -1275,7 +1275,7 @@ static struct console sercons = { ...@@ -1275,7 +1275,7 @@ static struct console sercons = {
extern void sh_console_unregister (void); extern void sh_console_unregister (void);
#endif #endif
static void __init sci_console_init(void) static int __init sci_console_init(void)
{ {
register_console(&sercons); register_console(&sercons);
#ifdef CONFIG_SH_EARLY_PRINTK #ifdef CONFIG_SH_EARLY_PRINTK
...@@ -1284,6 +1284,7 @@ static void __init sci_console_init(void) ...@@ -1284,6 +1284,7 @@ static void __init sci_console_init(void)
*/ */
sh_console_unregister(); sh_console_unregister();
#endif #endif
return 0;
} }
console_initcall(sci_console_init); console_initcall(sci_console_init);
......
...@@ -1091,7 +1091,7 @@ static struct console sercons = { ...@@ -1091,7 +1091,7 @@ static struct console sercons = {
}; };
static void __init vme_scc_console_init(void) static int __init vme_scc_console_init(void)
{ {
if (vme_brdtype == VME_TYPE_MVME147 || if (vme_brdtype == VME_TYPE_MVME147 ||
vme_brdtype == VME_TYPE_MVME162 || vme_brdtype == VME_TYPE_MVME162 ||
...@@ -1099,5 +1099,6 @@ static void __init vme_scc_console_init(void) ...@@ -1099,5 +1099,6 @@ static void __init vme_scc_console_init(void)
vme_brdtype == VME_TYPE_BVME4000 || vme_brdtype == VME_TYPE_BVME4000 ||
vme_brdtype == VME_TYPE_BVME6000) vme_brdtype == VME_TYPE_BVME6000)
register_console(&sercons); register_console(&sercons);
return 0;
} }
console_initcall(vme_scc_console_init); console_initcall(vme_scc_console_init);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment