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: macro@linux-mips.org
Date: Thu, 16 Jun 2005 21:37:47 +0100
Reply-to: linux-mips@linux-mips.org
Sender: linux-cvs-patches-bounce@linux-mips.org
CVSROOT:        /home/cvs
Module name:    linux
Changes by:     macro@ftp.linux-mips.org        05/06/16 21:37:42

Modified files:
        arch/mips/dec  : setup.c 
        drivers/tc     : tc.c 

Log message:
        Fix function types to ones appropriate for initcalls.

diff -urN linux/arch/mips/dec/setup.c linux/arch/mips/dec/setup.c
--- linux/arch/mips/dec/setup.c 2005/06/16 20:23:20     1.44
+++ linux/arch/mips/dec/setup.c 2005/06/16 20:37:40     1.45
@@ -129,7 +129,7 @@
 extern void dec_time_init(void);
 extern void dec_timer_setup(struct irqaction *);
 
-static void __init decstation_setup(void)
+static int __init decstation_setup(void)
 {
        board_be_init = dec_be_init;
        board_time_init = dec_time_init;
@@ -143,6 +143,8 @@
 
        ioport_resource.start = ~0UL;
        ioport_resource.end = 0UL;
+
+       return 0;
 }
 
 early_initcall(decstation_setup);
diff -urN linux/drivers/tc/tc.c linux/drivers/tc/tc.c
--- linux/drivers/tc/tc.c       2005/06/16 20:31:02     1.17
+++ linux/drivers/tc/tc.c       2005/06/16 20:37:41     1.18
@@ -8,7 +8,7 @@
  * for more details.
  *
  * Copyright (c) Harald Koerfgen, 1998
- * Copyright (c) 2001, 2003  Maciej W. Rozycki
+ * Copyright (c) 2001, 2003, 2005  Maciej W. Rozycki
  */
 #include <linux/string.h>
 #include <linux/init.h>
@@ -177,7 +177,7 @@
 /*
  * the main entry
  */
-void __init tc_init(void)
+static int __init tc_init(void)
 {
        int tc_clock;
        int i;
@@ -185,7 +185,7 @@
        unsigned long slot_size;
 
        if (!TURBOCHANNEL)
-               return;
+               return 0;
 
        for (i = 0; i < MAX_SLOT; i++) {
                tc_bus[i].base_addr = 0;
@@ -246,6 +246,8 @@
                        }
 #endif
        }
+
+       return 0;
 }
 
 subsys_initcall(tc_init);

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