patch-2.1.37 linux/drivers/net/sk_g16.c

• Lines: 44
• Date: Mon May 12 10:35:41 1997
• Orig file: v2.1.36/linux/drivers/net/sk_g16.c
• Orig date: Fri Apr 4 08:52:21 1997

diff -u --recursive --new-file v2.1.36/linux/drivers/net/sk_g16.c linux/drivers/net/sk_g16.c
@@ -68,6 +68,7 @@
 #include <asm/io.h>
 #include <asm/bitops.h> 
 #include <linux/errno.h>
+#include <linux/init.h>
 
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -532,7 +533,7 @@
  *                         (detachable devices only).
  */
 
-int SK_init(struct device *dev)
+__initfunc(int SK_init(struct device *dev))
 {
 	int ioaddr         = 0;            /* I/O port address used for POS regs */
 	int *port, ports[] = SK_IO_PORTS;  /* SK_G16 supported ports */
@@ -616,7 +617,7 @@
  *     94/06/30  pwe  SK_ADDR now checked and at the correct place
 -*/
 
-int SK_probe(struct device *dev, short ioaddr)
+__initfunc(int SK_probe(struct device *dev, short ioaddr))
 {
     int i,j;                /* Counters */
     int sk_addr_flag = 0;   /* SK ADDR correct? 1 - no, 0 - yes */
@@ -1210,7 +1211,7 @@
      * This means check if we are already in. 
      */
 
-    if (set_bit(0, (void *) &dev->tbusy) != 0) /* dev->tbusy already set ? */ 
+    if (test_and_set_bit(0, (void *) &dev->tbusy) != 0) /* dev->tbusy already set ? */ 
     {
 	printk("%s: Transmitter access conflict.\n", dev->name);
     }
@@ -1740,7 +1741,7 @@
  *     YY/MM/DD  uid  Description
 -*/
 
-unsigned int SK_rom_addr(void)
+__initfunc(unsigned int SK_rom_addr(void))
 {
     int i,j;
     int rom_found = 0;