linux-cvs-patches
[Top] [All Lists]

CVS Update@linux-mips.org: linux

To: linux-cvs-patches@linux-mips.org
Subject: CVS Update@linux-mips.org: linux
From: ralf@linux-mips.org
Date: Tue, 21 Jun 2005 14:56:38 +0100
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/06/21 14:56:33

Modified files:
        arch/mips/au1000/common: setup.c 
        arch/mips/cobalt: setup.c 
        arch/mips/ddb5xxx/ddb5074: setup.c 
        arch/mips/ddb5xxx/ddb5476: setup.c 
        arch/mips/ddb5xxx/ddb5477: setup.c 
        arch/mips/dec  : setup.c 
        arch/mips/galileo-boards/ev96100: setup.c 
        arch/mips/gt64120/ev64120: setup.c 
        arch/mips/gt64120/momenco_ocelot: setup.c 
        arch/mips/ite-boards/generic: it8172_setup.c 
        arch/mips/jazz : setup.c 
        arch/mips/jmr3927/rbhma3100: setup.c 
        arch/mips/kernel: setup.c vmlinux.lds.S 
        arch/mips/lasat: setup.c 
        arch/mips/mips-boards/atlas: atlas_setup.c 
        arch/mips/mips-boards/generic: pci.c 
        arch/mips/mips-boards/malta: malta_setup.c 
        arch/mips/mips-boards/sead: sead_setup.c 
        arch/mips/momentum/jaguar_atx: setup.c 
        arch/mips/momentum/ocelot_3: setup.c 
        arch/mips/momentum/ocelot_c: setup.c 
        arch/mips/momentum/ocelot_g: setup.c 
        arch/mips/pci  : pci-lasat.c 
        arch/mips/pmc-sierra/yosemite: setup.c 
        arch/mips/sgi-ip22: ip22-setup.c 
        arch/mips/sgi-ip27: ip27-init.c 
        arch/mips/sgi-ip32: ip32-setup.c 
        arch/mips/sibyte/swarm: setup.c 
        arch/mips/sni  : setup.c 
        arch/mips/tx4927/common: tx4927_setup.c 
        arch/mips/vr41xx/common: rtc.c 
        arch/mips/vr41xx/nec-cmbvr4133: setup.c 
        include/asm-mips/mips-boards: generic.h 
        include/linux  : init.h 

Log message:
        Get rid of early_init.  There's more need to make this form of
        initialization actually useful and as is certainly unmergable with
        upstream.

diff -urN linux/arch/mips/au1000/common/setup.c 
linux/arch/mips/au1000/common/setup.c
--- linux/arch/mips/au1000/common/setup.c       2005/04/04 01:06:19     1.22
+++ linux/arch/mips/au1000/common/setup.c       2005/06/21 13:56:30     1.23
@@ -57,7 +57,7 @@
 extern void au1xxx_timer_setup(struct irqaction *irq);
 extern void set_cpuspec(void);
 
-static int __init au1x00_setup(void)
+void __init plat_setup(void)
 {
        struct  cpu_spec *sp;
        char *argptr;
@@ -151,12 +151,8 @@
        au_sync();
        while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T0S);
        au_writel(0, SYS_TOYTRIM);
-
-       return 0;
 }
 
-early_initcall(au1x00_setup);
-
 #if defined(CONFIG_64BIT_PHYS_ADDR)
 /* This routine should be valid for all Au1x based boards */
 phys_t fixup_bigphys_addr(phys_t phys_addr, phys_t size)
diff -urN linux/arch/mips/cobalt/setup.c linux/arch/mips/cobalt/setup.c
--- linux/arch/mips/cobalt/setup.c      2005/04/11 12:42:08     1.24
+++ linux/arch/mips/cobalt/setup.c      2005/06/21 13:56:30     1.25
@@ -91,7 +91,7 @@
        .io_offset      = 0 - GT64111_IO_BASE
 };
 
-static int __init cobalt_setup(void)
+int __init plat_setup(void)
 {
        static struct uart_port uart;
        unsigned int devfn = PCI_DEVFN(COBALT_PCICONF_VIA, 0);
@@ -146,12 +146,8 @@
                early_serial_setup(&uart);
        }
 #endif
-
-       return 0;
 }
 
-early_initcall(cobalt_setup);
-
 /*
  * Prom init. We read our one and only communication with the firmware.
  * Grab the amount of installed memory.
diff -urN linux/arch/mips/ddb5xxx/ddb5074/setup.c 
linux/arch/mips/ddb5xxx/ddb5074/setup.c
--- linux/arch/mips/ddb5xxx/ddb5074/setup.c     2005/01/15 01:31:04     1.18
+++ linux/arch/mips/ddb5xxx/ddb5074/setup.c     2005/06/21 13:56:30     1.19
@@ -85,7 +85,7 @@
 
 
 
-static void __init ddb5074_setup(void)
+void __init plat_setup(void)
 {
        set_io_port_base(NILE4_PCI_IO_BASE);
        isa_slot_offset = NILE4_PCI_MEM_BASE;
@@ -106,8 +106,6 @@
        panic_timeout = 180;
 }
 
-early_initcall(ddb5074_setup);
-
 #define USE_NILE4_SERIAL       0
 
 #if USE_NILE4_SERIAL
diff -urN linux/arch/mips/ddb5xxx/ddb5476/setup.c 
linux/arch/mips/ddb5xxx/ddb5476/setup.c
--- linux/arch/mips/ddb5xxx/ddb5476/setup.c     2005/01/15 01:31:04     1.25
+++ linux/arch/mips/ddb5xxx/ddb5476/setup.c     2005/06/21 13:56:30     1.26
@@ -124,7 +124,7 @@
 
 static void ddb5476_board_init(void);
 
-static void __init ddb5476_setup(void)
+void __init plat_setup(void)
 {
        set_io_port_base(KSEG1ADDR(DDB_PCI_IO_BASE));
 
@@ -158,8 +158,6 @@
        ddb5476_board_init();
 }
 
-early_initcall(ddb5476_setup);
-
 /*
  * We don't trust bios.  We essentially does hardware re-initialization
  * as complete as possible, as far as we know we can safely do.
diff -urN linux/arch/mips/ddb5xxx/ddb5477/setup.c 
linux/arch/mips/ddb5xxx/ddb5477/setup.c
--- linux/arch/mips/ddb5xxx/ddb5477/setup.c     2005/01/13 14:05:29     1.27
+++ linux/arch/mips/ddb5xxx/ddb5477/setup.c     2005/06/21 13:56:30     1.28
@@ -170,7 +170,7 @@
 extern struct pci_controller ddb5477_ext_controller;
 extern struct pci_controller ddb5477_io_controller;
 
-static int  ddb5477_setup(void)
+static void ddb5477_setup(void)
 {
        /* initialize board - we don't trust the loader */
         ddb5477_board_init();
@@ -193,12 +193,8 @@
 
        register_pci_controller (&ddb5477_ext_controller);
        register_pci_controller (&ddb5477_io_controller);
-
-       return 0;
 }
 
-early_initcall(ddb5477_setup);
-
 static void __init ddb5477_board_init(void)
 {
        /* ----------- setup PDARs ------------ */
diff -urN linux/arch/mips/dec/setup.c linux/arch/mips/dec/setup.c
--- linux/arch/mips/dec/setup.c 2005/06/16 20:37:40     1.45
+++ linux/arch/mips/dec/setup.c 2005/06/21 13:56:30     1.46
@@ -129,7 +129,7 @@
 extern void dec_time_init(void);
 extern void dec_timer_setup(struct irqaction *);
 
-static int __init decstation_setup(void)
+void __init decstation_setup(void)
 {
        board_be_init = dec_be_init;
        board_time_init = dec_time_init;
@@ -143,12 +143,8 @@
 
        ioport_resource.start = ~0UL;
        ioport_resource.end = 0UL;
-
-       return 0;
 }
 
-early_initcall(decstation_setup);
-
 /*
  * Machine-specific initialisation for KN01, aka DS2100 (aka Pmin)
  * or DS3100 (aka Pmax).
diff -urN linux/arch/mips/galileo-boards/ev96100/setup.c 
linux/arch/mips/galileo-boards/ev96100/setup.c
--- linux/arch/mips/galileo-boards/ev96100/setup.c      2003/12/17 11:46:18     
1.21
+++ linux/arch/mips/galileo-boards/ev96100/setup.c      2005/06/21 13:56:30     
1.22
@@ -55,7 +55,7 @@
 
 unsigned char mac_0_1[12];
 
-static void __init ev96100_setup(void)
+void __init plat_setup(void)
 {
        unsigned int config = read_c0_config();
        unsigned int status = read_c0_status();
@@ -142,8 +142,6 @@
        tmp = GT_READ(GT_PCI0_CFGDATA_OFS);
 }
 
-early_initcall(ev96100_setup);
-
 unsigned short get_gt_devid(void)
 {
        u32 gt_devid;
diff -urN linux/arch/mips/gt64120/ev64120/setup.c 
linux/arch/mips/gt64120/ev64120/setup.c
--- linux/arch/mips/gt64120/ev64120/setup.c     2004/01/28 22:16:39     1.8
+++ linux/arch/mips/gt64120/ev64120/setup.c     2005/06/21 13:56:30     1.9
@@ -69,7 +69,7 @@
  */
 extern void gt64120_time_init(void);
 
-static void __init ev64120_setup(void)
+void __init plat_setup(void)
 {
        _machine_restart = galileo_machine_restart;
        _machine_halt = galileo_machine_halt;
@@ -79,8 +79,6 @@
        set_io_port_base(KSEG1);
 }
 
-early_initcall(ev64120_setup);
-
 const char *get_system_type(void)
 {
        return "Galileo EV64120A";
diff -urN linux/arch/mips/gt64120/momenco_ocelot/setup.c 
linux/arch/mips/gt64120/momenco_ocelot/setup.c
--- linux/arch/mips/gt64120/momenco_ocelot/setup.c      2004/12/07 22:06:59     
1.22
+++ linux/arch/mips/gt64120/momenco_ocelot/setup.c      2005/06/21 13:56:30     
1.23
@@ -150,7 +150,7 @@
        gt64120_base = 0xe0000000;
 }
 
-static void __init momenco_ocelot_setup(void)
+void __init plat_setup(void)
 {
        void (*l3func)(unsigned long)=KSEG1ADDR(&setup_l3cache);
        unsigned int tmpword;
@@ -307,8 +307,6 @@
        GT_WRITE(GT_DEV_B3_OFS, 0xfef73);
 }
 
-early_initcall(momenco_ocelot_setup);
-
 extern int rm7k_tcache_enabled;
 /*
  * This runs in KSEG1. See the verbiage in rm7k.c::probe_scache()
diff -urN linux/arch/mips/ite-boards/generic/it8172_setup.c 
linux/arch/mips/ite-boards/generic/it8172_setup.c
--- linux/arch/mips/ite-boards/generic/it8172_setup.c   2004/01/22 22:04:04     
1.21
+++ linux/arch/mips/ite-boards/generic/it8172_setup.c   2005/06/21 13:56:30     
1.22
@@ -105,7 +105,7 @@
        it8172_resources.ram.end = memsize;
 }
 
-static void __init it8172_setup(void)
+void __init plat_setup(void)
 {
        unsigned short dsr;
        char *argptr;
@@ -251,8 +251,6 @@
 #endif /* CONFIG_IT8172_SCR1 */
 }
 
-early_initcall(it8172_setup);
-
 #ifdef CONFIG_SERIO_I8042
 /*
  * According to the ITE Special BIOS Note for waking up the
diff -urN linux/arch/mips/jazz/setup.c linux/arch/mips/jazz/setup.c
--- linux/arch/mips/jazz/setup.c        2004/01/22 22:04:05     1.48
+++ linux/arch/mips/jazz/setup.c        2005/06/21 13:56:31     1.49
@@ -50,7 +50,7 @@
        { "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },
 };
 
-static void __init jazz_setup(void)
+void __init plat_setup(void)
 {
        int i;
 
@@ -97,5 +97,3 @@
 
        vdma_init();
 }
-
-early_initcall(jazz_setup);
diff -urN linux/arch/mips/jmr3927/rbhma3100/setup.c 
linux/arch/mips/jmr3927/rbhma3100/setup.c
--- linux/arch/mips/jmr3927/rbhma3100/setup.c   2005/03/04 17:24:32     1.18
+++ linux/arch/mips/jmr3927/rbhma3100/setup.c   2005/06/21 13:56:31     1.19
@@ -198,7 +198,7 @@
 extern struct resource pci_io_resource;
 extern struct resource pci_mem_resource;
 
-static void __init jmr3927_setup(void)
+void __init plat_setup(void)
 {
        char *argptr;
 
@@ -299,9 +299,6 @@
 #endif
 }
 
-early_initcall(jmr3927_setup);
-
-
 static void tx3927_setup(void);
 
 #ifdef CONFIG_PCI
@@ -360,7 +357,7 @@
                       jmr3927_io_dipsw());
 }
 
-static void __init tx3927_setup(void)
+void __init plat_setup(void)
 {
        int i;
 
diff -urN linux/arch/mips/kernel/setup.c linux/arch/mips/kernel/setup.c
--- linux/arch/mips/kernel/setup.c      2005/05/31 11:49:19     1.180
+++ linux/arch/mips/kernel/setup.c      2005/06/21 13:56:31     1.181
@@ -507,32 +507,6 @@
 #undef MAXMEM
 #undef MAXMEM_PFN
 
-static int __initdata earlyinit_debug;
-
-static int __init earlyinit_debug_setup(char *str)
-{
-       earlyinit_debug = 1;
-       return 1;
-}
-__setup("earlyinit_debug", earlyinit_debug_setup);
-
-extern initcall_t __earlyinitcall_start, __earlyinitcall_end;
-
-static void __init do_earlyinitcalls(void)
-{
-       initcall_t *call, *start, *end;
-
-       start = &__earlyinitcall_start;
-       end = &__earlyinitcall_end;
-
-       for (call = start; call < end; call++) {
-               if (earlyinit_debug)
-                       printk("calling earlyinitcall 0x%p\n", *call);
-
-               (*call)();
-       }
-}
-
 void __init setup_arch(char **cmdline_p)
 {
        cpu_probe();
@@ -548,7 +522,7 @@
 #endif
 
        /* call board setup routine */
-       do_earlyinitcalls();
+       plat_setup();
 
        strlcpy(command_line, arcs_cmdline, sizeof(command_line));
        strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
diff -urN linux/arch/mips/kernel/vmlinux.lds.S 
linux/arch/mips/kernel/vmlinux.lds.S
--- linux/arch/mips/kernel/vmlinux.lds.S        2005/03/16 10:23:31     1.13
+++ linux/arch/mips/kernel/vmlinux.lds.S        2005/06/21 13:56:31     1.14
@@ -89,12 +89,6 @@
   .init.setup : { *(.init.setup) }
   __setup_end = .;
 
-  .early_initcall.init : {
-  __earlyinitcall_start = .;
-       *(.initcall.early1.init)
-  }
-  __earlyinitcall_end = .;
-
   __initcall_start = .;
   .initcall.init : {
        *(.initcall1.init)
diff -urN linux/arch/mips/lasat/setup.c linux/arch/mips/lasat/setup.c
--- linux/arch/mips/lasat/setup.c       2004/07/14 16:58:59     1.15
+++ linux/arch/mips/lasat/setup.c       2005/06/21 13:56:31     1.16
@@ -155,7 +155,7 @@
 }
 #endif
 
-static int __init lasat_setup(void)
+void __init plat_setup(void)
 {
        int i;
        lasat_misc  = &lasat_misc_info[mips_machtype];
@@ -185,8 +185,4 @@
        change_c0_status(ST0_BEV,0);
 
        prom_printf("Lasat specific initialization complete\n");
-
-        return 0;
 }
-
-early_initcall(lasat_setup);
diff -urN linux/arch/mips/mips-boards/atlas/atlas_setup.c 
linux/arch/mips/mips-boards/atlas/atlas_setup.c
--- linux/arch/mips/mips-boards/atlas/atlas_setup.c     2004/07/14 16:58:59     
1.24
+++ linux/arch/mips/mips-boards/atlas/atlas_setup.c     2005/06/21 13:56:31     
1.25
@@ -50,8 +50,10 @@
        return "MIPS Atlas";
 }
 
-static int __init atlas_setup(void)
+void __init plat_setup(void)
 {
+       mips_pcibios_init();
+
        ioport_resource.end = 0x7fffffff;
 
        serial_init ();
@@ -64,12 +66,8 @@
        board_time_init = mips_time_init;
        board_timer_setup = mips_timer_setup;
        rtc_get_time = mips_rtc_get_time;
-
-       return 0;
 }
 
-early_initcall(atlas_setup);
-
 static void __init serial_init(void)
 {
 #ifdef CONFIG_SERIAL_8250
diff -urN linux/arch/mips/mips-boards/generic/pci.c 
linux/arch/mips/mips-boards/generic/pci.c
--- linux/arch/mips/mips-boards/generic/pci.c   2005/04/14 11:31:25     1.29
+++ linux/arch/mips/mips-boards/generic/pci.c   2005/06/21 13:56:31     1.30
@@ -87,7 +87,7 @@
        .mem_resource   = &msc_mem_resource,
 };
 
-static int __init pcibios_init(void)
+void __init mips_pcibios_init(void)
 {
        struct pci_controller *controller;
        unsigned long start, end, map, start1, end1, map1, map2, map3, mask;
@@ -234,7 +234,7 @@
                controller = &msc_controller;
                break;
        default:
-               return 1;
+               return;
        }
 
        if (controller->io_resource->start < 0x00001000UL)      /* FIXME */
@@ -244,8 +244,4 @@
        ioport_resource.end = controller->io_resource->end;
 
        register_pci_controller (controller);
-
-       return 0;
 }
-
-early_initcall(pcibios_init);
diff -urN linux/arch/mips/mips-boards/malta/malta_setup.c 
linux/arch/mips/mips-boards/malta/malta_setup.c
--- linux/arch/mips/mips-boards/malta/malta_setup.c     2004/11/02 21:43:03     
1.31
+++ linux/arch/mips/mips-boards/malta/malta_setup.c     2005/06/21 13:56:31     
1.32
@@ -111,10 +111,12 @@
 }
 #endif
 
-static int __init malta_setup(void)
+void __init plat_setup(void)
 {
        unsigned int i;
 
+       mips_pcibios_init();
+
        /* Request I/O space for devices used on the Malta board. */
        for (i = 0; i < ARRAY_SIZE(standard_io_resources); i++)
                request_resource(&ioport_resource, standard_io_resources+i);
@@ -224,8 +226,4 @@
        board_time_init = mips_time_init;
        board_timer_setup = mips_timer_setup;
        rtc_get_time = mips_rtc_get_time;
-
-       return 0;
 }
-
-early_initcall(malta_setup);
diff -urN linux/arch/mips/mips-boards/sead/sead_setup.c 
linux/arch/mips/mips-boards/sead/sead_setup.c
--- linux/arch/mips/mips-boards/sead/sead_setup.c       2004/07/14 16:58:59     
1.10
+++ linux/arch/mips/mips-boards/sead/sead_setup.c       2005/06/21 13:56:31     
1.11
@@ -57,8 +57,6 @@
        mips_reboot_setup();
 }
 
-early_initcall(sead_setup);
-
 static void __init serial_init(void)
 {
 #ifdef CONFIG_SERIAL_8250
diff -urN linux/arch/mips/momentum/jaguar_atx/setup.c 
linux/arch/mips/momentum/jaguar_atx/setup.c
--- linux/arch/mips/momentum/jaguar_atx/setup.c 2004/08/26 20:18:00     1.14
+++ linux/arch/mips/momentum/jaguar_atx/setup.c 2005/06/21 13:56:31     1.15
@@ -351,7 +351,7 @@
 
 arch_initcall(ja_pci_init);
 
-static int  __init momenco_jaguar_atx_setup(void)
+int  __init plat_setup(void)
 {
        unsigned int tmpword;
 
@@ -467,8 +467,4 @@
 
        }
 #endif
-
-       return 0;
 }
-
-early_initcall(momenco_jaguar_atx_setup);
diff -urN linux/arch/mips/momentum/ocelot_3/setup.c 
linux/arch/mips/momentum/ocelot_3/setup.c
--- linux/arch/mips/momentum/ocelot_3/setup.c   2005/01/15 01:31:05     1.3
+++ linux/arch/mips/momentum/ocelot_3/setup.c   2005/06/21 13:56:31     1.4
@@ -307,7 +307,7 @@
 
 arch_initcall(ja_pci_init);
 
-static int __init momenco_ocelot_3_setup(void)
+int __init plat_setup(void)
 {
        unsigned int tmpword;
 
@@ -391,8 +391,4 @@
 
        /* Support for 128 MB memory */
        add_memory_region(0x0, 0x08000000, BOOT_MEM_RAM);
-
-       return 0;
 }
-
-early_initcall(momenco_ocelot_3_setup);
diff -urN linux/arch/mips/momentum/ocelot_c/setup.c 
linux/arch/mips/momentum/ocelot_c/setup.c
--- linux/arch/mips/momentum/ocelot_c/setup.c   2004/06/24 21:49:57     1.19
+++ linux/arch/mips/momentum/ocelot_c/setup.c   2005/06/21 13:56:31     1.20
@@ -222,7 +222,7 @@
        rtc_set_time = m48t37y_set_time;
 }
 
-static void __init momenco_ocelot_c_setup(void)
+void __init plat_setup(void)
 {
        unsigned int tmpword;
 
@@ -340,8 +340,6 @@
        }
 }
 
-early_initcall(momenco_ocelot_c_setup);
-
 #ifndef CONFIG_MIPS64
 /* This needs to be one of the first initcalls, because no I/O port access
    can work before this */
diff -urN linux/arch/mips/momentum/ocelot_g/setup.c 
linux/arch/mips/momentum/ocelot_g/setup.c
--- linux/arch/mips/momentum/ocelot_g/setup.c   2004/06/24 21:49:57     1.18
+++ linux/arch/mips/momentum/ocelot_g/setup.c   2005/06/21 13:56:31     1.19
@@ -160,7 +160,7 @@
        printk("Done\n");
 }
 
-static int  __init momenco_ocelot_g_setup(void)
+int  __init plat_setup(void)
 {
        void (*l3func)(unsigned long) = (void *) KSEG1ADDR(setup_l3cache);
        unsigned int tmpword;
@@ -240,12 +240,8 @@
 
        /* FIXME: Fix up the DiskOnChip mapping */
        MV_WRITE(0x468, 0xfef73);
-
-       return 0;
 }
 
-early_initcall(momenco_ocelot_g_setup);
-
 /* This needs to be one of the first initcalls, because no I/O port access
    can work before this */
 
diff -urN linux/arch/mips/pci/pci-lasat.c linux/arch/mips/pci/pci-lasat.c
--- linux/arch/mips/pci/pci-lasat.c     2005/04/14 12:34:15     1.9
+++ linux/arch/mips/pci/pci-lasat.c     2005/06/21 13:56:31     1.10
@@ -34,7 +34,7 @@
        .io_resource    = &lasat_pci_io_resource,
 };
 
-static int __init lasat_pci_setup(void)
+void __init plat_setup(void)
 {
        printk("PCI: starting\n");
 
@@ -50,9 +50,7 @@
         }
 
        register_pci_controller(&lasat_pci_controller);
-        return 0;
 }
-early_initcall(lasat_pci_setup);
 
 #define LASATINT_ETH1   0
 #define LASATINT_ETH0   1
diff -urN linux/arch/mips/pmc-sierra/yosemite/setup.c 
linux/arch/mips/pmc-sierra/yosemite/setup.c
--- linux/arch/mips/pmc-sierra/yosemite/setup.c 2004/12/19 02:38:44     1.12
+++ linux/arch/mips/pmc-sierra/yosemite/setup.c 2005/06/21 13:56:32     1.13
@@ -212,7 +212,7 @@
        py_rtc_setup();
 }
 
-static int __init pmc_yosemite_setup(void)
+void __init plat_setup(void)
 {
        board_time_init = yosemite_time_init;
        late_time_init = py_late_time_init;
@@ -228,8 +228,4 @@
        OCD_WRITE(RM9000x2_OCD_HTBAR0, HYPERTRANSPORT_BAR0_ADDR);
        OCD_WRITE(RM9000x2_OCD_HTMASK0, HYPERTRANSPORT_SIZE0);
 #endif
-
-       return 0;
 }
-
-early_initcall(pmc_yosemite_setup);
diff -urN linux/arch/mips/sgi-ip22/ip22-setup.c 
linux/arch/mips/sgi-ip22/ip22-setup.c
--- linux/arch/mips/sgi-ip22/ip22-setup.c       2004/12/10 13:31:42     1.44
+++ linux/arch/mips/sgi-ip22/ip22-setup.c       2005/06/21 13:56:32     1.45
@@ -53,7 +53,7 @@
 extern void ip22_be_init(void) __init;
 extern void ip22_time_init(void) __init;
 
-static int __init ip22_setup(void)
+void __init plat_setup(void)
 {
        char *ctype;
 
@@ -137,8 +137,4 @@
                }
        }
 #endif
-
-       return 0;
 }
-
-early_initcall(ip22_setup);
diff -urN linux/arch/mips/sgi-ip27/ip27-init.c 
linux/arch/mips/sgi-ip27/ip27-init.c
--- linux/arch/mips/sgi-ip27/ip27-init.c        2005/03/21 18:59:38     1.68
+++ linux/arch/mips/sgi-ip27/ip27-init.c        2005/06/21 13:56:32     1.69
@@ -196,7 +196,7 @@
 extern void ip27_time_init(void);
 extern void ip27_reboot_setup(void);
 
-static int __init ip27_setup(void)
+void __init plat_setup(void)
 {
        hubreg_t p, e, n_mode;
        nasid_t nid;
@@ -246,5 +246,3 @@
 
        return 0;
 }
-
-early_initcall(ip27_setup);
diff -urN linux/arch/mips/sgi-ip32/ip32-setup.c 
linux/arch/mips/sgi-ip32/ip32-setup.c
--- linux/arch/mips/sgi-ip32/ip32-setup.c       2005/01/13 14:20:24     1.24
+++ linux/arch/mips/sgi-ip32/ip32-setup.c       2005/06/21 13:56:32     1.25
@@ -92,7 +92,7 @@
        setup_irq(IP32_R4K_TIMER_IRQ, irq);
 }
 
-static int __init ip32_setup(void)
+void __init plat_setup(void)
 {
        board_be_init = ip32_be_init;
 
@@ -152,8 +152,4 @@
                }
        }
 #endif
-
-       return 0;
 }
-
-early_initcall(ip32_setup);
diff -urN linux/arch/mips/sibyte/swarm/setup.c 
linux/arch/mips/sibyte/swarm/setup.c
--- linux/arch/mips/sibyte/swarm/setup.c        2005/01/13 14:05:31     1.34
+++ linux/arch/mips/sibyte/swarm/setup.c        2005/06/21 13:56:32     1.35
@@ -84,7 +84,7 @@
        return (is_fixup ? MIPS_BE_FIXUP : MIPS_BE_FATAL);
 }
 
-static int __init swarm_setup(void)
+int __init plat_setup(void)
 {
        sb1250_setup();
 
@@ -133,12 +133,8 @@
        };
        /* XXXKW for CFE, get lines/cols from environment */
 #endif
-
-       return 0;
 }
 
-early_initcall(swarm_setup);
-
 #ifdef LEDS_PHYS
 
 #ifdef CONFIG_SIBYTE_CARMEL
diff -urN linux/arch/mips/sni/setup.c linux/arch/mips/sni/setup.c
--- linux/arch/mips/sni/setup.c 2004/08/26 20:18:00     1.51
+++ linux/arch/mips/sni/setup.c 2005/06/21 13:56:32     1.52
@@ -167,7 +167,7 @@
        rtc_set_time = mc146818_set_rtc_mmss;
 }
 
-static int __init sni_rm200_pci_setup(void)
+void __init plat_setup(void)
 {
        sni_pcimt_detect();
        sni_pcimt_sc_init();
@@ -196,8 +196,4 @@
 #ifdef CONFIG_PCI
        register_pci_controller(&sni_controller);
 #endif
-
-       return 0;
 }
-
-early_initcall(sni_rm200_pci_setup);
diff -urN linux/arch/mips/tx4927/common/tx4927_setup.c 
linux/arch/mips/tx4927/common/tx4927_setup.c
--- linux/arch/mips/tx4927/common/tx4927_setup.c        2004/10/25 20:44:17     
1.7
+++ linux/arch/mips/tx4927/common/tx4927_setup.c        2005/06/21 13:56:32     
1.8
@@ -76,12 +76,8 @@
                toshiba_rbtx4927_setup();
        }
 #endif
-
-       return;
 }
 
-early_initcall(tx4927_setup);
-
 void __init tx4927_time_init(void)
 {
 
diff -urN linux/arch/mips/vr41xx/common/rtc.c 
linux/arch/mips/vr41xx/common/rtc.c
--- linux/arch/mips/vr41xx/common/rtc.c 2004/05/26 16:36:33     1.6
+++ linux/arch/mips/vr41xx/common/rtc.c 2005/06/21 13:56:32     1.7
@@ -310,12 +310,8 @@
        setup_irq(ELAPSEDTIME_IRQ, irq);
 }
 
-static int __init vr41xx_rtc_init(void)
+static void __init vr41xx_rtc_init(void)
 {
        board_time_init = vr41xx_time_init;
        board_timer_setup = vr41xx_timer_setup;
-
-       return 0;
 }
-
-early_initcall(vr41xx_rtc_init);
diff -urN linux/arch/mips/vr41xx/nec-cmbvr4133/setup.c 
linux/arch/mips/vr41xx/nec-cmbvr4133/setup.c
--- linux/arch/mips/vr41xx/nec-cmbvr4133/setup.c        2005/05/19 15:26:29     
1.2
+++ linux/arch/mips/vr41xx/nec-cmbvr4133/setup.c        2005/06/21 13:56:32     
1.3
@@ -57,7 +57,7 @@
 
 extern void i8259_init(void);
 
-static int __init nec_cmbvr4133_setup(void)
+static void __init nec_cmbvr4133_setup(void)
 {
 #ifdef CONFIG_ROCKHOPPER
        extern void disable_pcnet(void);
@@ -91,7 +91,4 @@
 #ifdef CONFIG_ROCKHOPPER
        i8259_init();
 #endif
-       return 0;
 }
-
-early_initcall(nec_cmbvr4133_setup);
diff -urN linux/include/asm-mips/mips-boards/generic.h 
linux/include/asm-mips/mips-boards/generic.h
--- linux/include/asm-mips/mips-boards/generic.h        2004/01/20 13:04:44     
1.6
+++ linux/include/asm-mips/mips-boards/generic.h        2005/06/21 13:56:32     
1.7
@@ -79,4 +79,10 @@
 
 extern unsigned int mips_revision_corid;
 
+#ifdef CONFIG_PCI
+extern void mips_pcibios_init(void);
+#else
+#define mips_pcibios_init() do { } while (0)
+#endif
+
 #endif  /* __ASM_MIPS_BOARDS_GENERIC_H */
diff -urN linux/include/linux/init.h linux/include/linux/init.h
--- linux/include/linux/init.h  2005/01/13 14:06:53     1.38
+++ linux/include/linux/init.h  2005/06/21 13:56:32     1.39
@@ -86,8 +86,6 @@
        static initcall_t __initcall_##fn __attribute_used__ \
        __attribute__((__section__(".initcall" level ".init"))) = fn
 
-#define early_initcall(fn)             __define_initcall(".early1",fn)
-
 #define core_initcall(fn)              __define_initcall("1",fn)
 #define postcore_initcall(fn)          __define_initcall("2",fn)
 #define arch_initcall(fn)              __define_initcall("3",fn)

<Prev in Thread] Current Thread [Next in Thread>