Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Christoph Hellwig and committed by
Linus Torvalds
a1007770 573fc113

+2 -12
-6
drivers/char/tty_io.c
··· 153 153 int tty_ioctl(struct inode * inode, struct file * file, 154 154 unsigned int cmd, unsigned long arg); 155 155 static int tty_fasync(int fd, struct file * filp, int on); 156 - extern void rs_360_init(void); 157 156 static void release_mem(struct tty_struct *tty, int idx); 158 157 159 158 ··· 2909 2910 */ 2910 2911 #ifdef CONFIG_EARLY_PRINTK 2911 2912 disable_early_printk(); 2912 - #endif 2913 - #ifdef CONFIG_SERIAL_68360 2914 - /* This is not a console initcall. I know not what it's doing here. 2915 - So I haven't moved it. dwmw2 */ 2916 - rs_360_init(); 2917 2913 #endif 2918 2914 call = __con_initcall_start; 2919 2915 while (call < __con_initcall_end) {
+2 -6
drivers/serial/68360serial.c
··· 2474 2474 .tiocmset = rs_360_tiocmset, 2475 2475 }; 2476 2476 2477 - /* int __init rs_360_init(void) */ 2478 - int rs_360_init(void) 2477 + static int __init rs_360_init(void) 2479 2478 { 2480 2479 struct serial_state * state; 2481 2480 ser_info_t *info; ··· 2826 2827 2827 2828 return 0; 2828 2829 } 2829 - 2830 - 2831 - 2832 - 2830 + module_init(rs_360_init); 2833 2831 2834 2832 /* This must always be called before the rs_360_init() function, otherwise 2835 2833 * it blows away the port control information.