patch-2.1.36 linux/drivers/char/pcwd.c

Next file: linux/drivers/char/pcxx.c
Previous file: linux/drivers/char/msbusmouse.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.35/linux/drivers/char/pcwd.c linux/drivers/char/pcwd.c
@@ -48,6 +48,7 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/watchdog.h>
+#include <linux/init.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -96,7 +97,7 @@
  * This routine checks the "current_readport" to see if the card lies there.
  * If it does, it returns accordingly.
  */
-static int pcwd_checkcard(void)
+__initfunc(static int pcwd_checkcard(void))
 {
 	int card_dat, prev_card_dat, found = 0, count = 0, done = 0;
 
@@ -400,13 +401,13 @@
 	return 0;
 }
 
-static void get_support(void)
+static inline void get_support(void)
 {
 	if (inb(current_readport) != 0xF0)
 		supports_temp = 1;
 }
 
-static int get_revision(void)
+static inline int get_revision(void)
 {
 	if ((inb(current_readport + 2) == 0xFF) ||
 	    (inb(current_readport + 3) == 0xFF))
@@ -415,7 +416,7 @@
 	return(PCWD_REVISION_C);
 }
 
-static int send_command(int cmd)
+__initfunc(static int send_command(int cmd))
 {
 	int i;
 
@@ -428,7 +429,7 @@
 	return(i);
 }
 
-static char *get_firmware(void)
+static inline char *get_firmware(void)
 {
 	int i, found = 0, count = 0, one, ten, hund, minor;
 	char *ret;
@@ -498,7 +499,7 @@
 #ifdef	MODULE
 int init_module(void)
 #else
-int pcwatchdog_init(void)
+__initfunc(int pcwatchdog_init(void))
 #endif
 {
 	int i, found = 0;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov