From: Christoph Hellwig Date: Tue, 6 Sep 2005 22:16:59 +0000 (-0700) Subject: [PATCH] move 68360serial.c over use initcalls X-Git-Tag: v2.6.14-rc1~709 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a10077708233becfbae7b0104e1e8c0569359aa7;p=linux-2.6-omap-h63xx.git [PATCH] move 68360serial.c over use initcalls this is the last serial driver not using initcalls. Signed-off-by: Christoph Hellwig Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 6e4be3bb2d8..9d657127f31 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -153,7 +153,6 @@ static int tty_release(struct inode *, struct file *); int tty_ioctl(struct inode * inode, struct file * file, unsigned int cmd, unsigned long arg); static int tty_fasync(int fd, struct file * filp, int on); -extern void rs_360_init(void); static void release_mem(struct tty_struct *tty, int idx); @@ -2910,11 +2909,6 @@ void __init console_init(void) */ #ifdef CONFIG_EARLY_PRINTK disable_early_printk(); -#endif -#ifdef CONFIG_SERIAL_68360 - /* This is not a console initcall. I know not what it's doing here. - So I haven't moved it. dwmw2 */ - rs_360_init(); #endif call = __con_initcall_start; while (call < __con_initcall_end) { diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c index b116122e569..170c9d2a749 100644 --- a/drivers/serial/68360serial.c +++ b/drivers/serial/68360serial.c @@ -2474,8 +2474,7 @@ static struct tty_operations rs_360_ops = { .tiocmset = rs_360_tiocmset, }; -/* int __init rs_360_init(void) */ -int rs_360_init(void) +static int __init rs_360_init(void) { struct serial_state * state; ser_info_t *info; @@ -2827,10 +2826,7 @@ int rs_360_init(void) return 0; } - - - - +module_init(rs_360_init); /* This must always be called before the rs_360_init() function, otherwise * it blows away the port control information.