Kill explicit rs_init calls and make it module_init.

4 files changed, 8 insertions, 12 deletions

diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c
index ccda6bcd5..a0ee1d3b3 100644
--- a/arch/sparc/kernel/ebus.c
+++ b/arch/sparc/kernel/ebus.c
@@ -1,4 +1,4 @@
-/* $Id: ebus.c,v 1.18 2001-11-08 04:41:33 davem Exp $
+/* $Id: ebus.c,v 1.19 2001-12-18 20:41:06 davem Exp $
  * ebus.c: PCI to EBus bridge device.
  *
  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
@@ -27,7 +27,6 @@ struct linux_ebus *ebus_chain = 0;
 #ifdef CONFIG_SUN_AUXIO
 extern void auxio_probe(void);
 #endif
-extern void rs_init(void);
 
 /* We are together with pcic.c under CONFIG_PCI. */
 extern unsigned int pcic_pin_to_irq(unsigned int, char *name);
@@ -365,7 +364,6 @@ void __init ebus_init(void)
 		++num_ebus;
 	}
 
-	rs_init();
 #ifdef CONFIG_SUN_AUXIO
 	auxio_probe();
 #endif
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index 88f1395b4..477d889a0 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -1,4 +1,4 @@
-/* $Id: pci.c,v 1.36 2001-10-06 00:38:25 davem Exp $
+/* $Id: pci.c,v 1.37 2001-12-18 20:41:06 davem Exp $
  * pci.c: UltraSparc PCI controller support.
  *
  * Copyright (C) 1997, 1998, 1999 David S. Miller (davem@redhat.com)
@@ -177,7 +177,6 @@ static void __init pci_reorder_devs(void)
 	}
 }
 
-extern void rs_init(void);
 extern void clock_probe(void);
 extern void power_init(void);
 
@@ -194,7 +193,6 @@ void __init pcibios_init(void)
 
 	isa_init();
 	ebus_init();
-	rs_init();
 	clock_probe();
 	power_init();
 }
diff --git a/drivers/sbus/char/sunserial.c b/drivers/sbus/char/sunserial.c
index 4abd65455..5e9f6c0b4 100644
--- a/drivers/sbus/char/sunserial.c
+++ b/drivers/sbus/char/sunserial.c
@@ -1,4 +1,4 @@
-/* $Id: sunserial.c,v 1.79 2001-04-18 21:06:17 davem Exp $
+/* $Id: sunserial.c,v 1.80 2001-12-18 20:41:06 davem Exp $
  * serial.c: Serial port driver infrastructure for the Sparc.
  *
  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
@@ -54,7 +54,7 @@ struct sunserial_operations rs_ops = {
 	nop_rs_read_proc
 };
 
-void rs_init(void)
+static int __init rs_init(void)
 {
 	static int invoked = 0;
 
@@ -69,6 +69,7 @@ void rs_init(void)
 			init = init->next;
 		}
 	}
+	return 0;
 }
 
 void __init rs_kgdb_hook(int channel)
@@ -455,3 +456,5 @@ void __init sun_serial_setup(void)
 	prom_printf("No serial devices found, bailing out.\n");
 	prom_halt();
 }
+
+module_init(rs_init);
diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c
index 10ffd4a28..6e1282125 100644
--- a/drivers/sbus/sbus.c
+++ b/drivers/sbus/sbus.c
@@ -1,4 +1,4 @@
-/* $Id: sbus.c,v 1.95 2001-03-15 02:11:10 davem Exp $
+/* $Id: sbus.c,v 1.96 2001-12-18 20:41:06 davem Exp $
  * sbus.c:  SBus support routines.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -281,7 +281,6 @@ static void __init sbus_fixup_all_regs(struct sbus_dev *first_sdev)
 
 extern void register_proc_sparc_ioport(void);
 extern void firetruck_init(void);
-extern void rs_init(void);
 
 void __init sbus_init(void)
 {
@@ -489,8 +488,6 @@ void __init sbus_init(void)
 		sun4d_init_sbi_irq();
 	}
 	
-	rs_init();
-
 #ifdef __sparc_v9__
 	if (sparc_cpu_model == sun4u) {
 		firetruck_init();