redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] move 68360serial.c over use initcalls 

this is the last serial driver not using initcalls.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: <jeff@uclinux.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
hifive-unleashed-5.1
Christoph Hellwig 2005-09-06 15:16:59 -07:00 committed by Linus Torvalds
parent 573fc11313
commit a100777082
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/tty_io.c
View File

@ -153,7 +153,6 @@ static int tty_release(struct inode *, struct file *);
int tty_ioctl(struct inode * inode, struct file * file, int tty_ioctl(struct inode * inode, struct file * file,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
static int tty_fasync(int fd, struct file * filp, int on); 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); static void release_mem(struct tty_struct *tty, int idx);
@ -2910,11 +2909,6 @@ void __init console_init(void)
*/ */
#ifdef CONFIG_EARLY_PRINTK #ifdef CONFIG_EARLY_PRINTK
disable_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 #endif
call = __con_initcall_start; call = __con_initcall_start;
while (call < __con_initcall_end) { while (call < __con_initcall_end) {

8
drivers/serial/68360serial.c
View File

@ -2474,8 +2474,7 @@ static struct tty_operations rs_360_ops = {
.tiocmset = rs_360_tiocmset, .tiocmset = rs_360_tiocmset,
}; };
/* int __init rs_360_init(void) */ static int __init rs_360_init(void)
int rs_360_init(void)
{ {
struct serial_state * state; struct serial_state * state;
ser_info_t *info; ser_info_t *info;
@ -2827,10 +2826,7 @@ int rs_360_init(void)
return 0; return 0;
} }
module_init(rs_360_init);
/* This must always be called before the rs_360_init() function, otherwise /* This must always be called before the rs_360_init() function, otherwise
* it blows away the port control information. * it blows away the port control information.