Skip to content

Commit

Permalink
[PATCH] move 68360serial.c over use initcalls
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Christoph Hellwig authored and Linus Torvalds committed Sep 7, 2005
1 parent 573fc11 commit a100777
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
6 changes: 0 additions & 6 deletions drivers/char/tty_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);


Expand Down Expand Up @@ -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) {
Expand Down
8 changes: 2 additions & 6 deletions drivers/serial/68360serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit a100777

Please sign in to comment.