patch-2.3.10 linux/drivers/net/cs89x0.c

Next file: linux/drivers/net/de4x5.c
Previous file: linux/drivers/net/cosa.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.9/linux/drivers/net/cs89x0.c linux/drivers/net/cs89x0.c
@@ -145,8 +145,8 @@
 struct netdev_entry netcard_drv =
 {"netcard", cs89x0_probe1, NETCARD_IO_EXTENT, netcard_portlist};
 #else
-__initfunc(int
-cs89x0_probe(struct device *dev))
+int __init 
+cs89x0_probe(struct device *dev)
 {
 	int i;
 	int base_addr = dev ? dev->base_addr : 0;
@@ -195,8 +195,8 @@
 	outw(value, dev->base_addr + portno);
 }
 
-__initfunc(static int
-wait_eeprom_ready(struct device *dev))
+static int __init 
+wait_eeprom_ready(struct device *dev)
 {
 	int timeout = jiffies;
 	/* check to see if the EEPROM is ready, a timeout is used -
@@ -208,8 +208,8 @@
 	return 0;
 }
 
-__initfunc(static int
-get_eeprom_data(struct device *dev, int off, int len, int *buffer))
+static int __init 
+get_eeprom_data(struct device *dev, int off, int len, int *buffer)
 {
 	int i;
 
@@ -226,8 +226,8 @@
         return 0;
 }
 
-__initfunc(static int
-get_eeprom_cksum(int off, int len, int *buffer))
+static int  __init 
+get_eeprom_cksum(int off, int len, int *buffer)
 {
 	int i, cksum;
 
@@ -244,7 +244,7 @@
    probes on the ISA bus.  A good device probes avoids doing writes, and
    verifies that the correct device exists and functions.  */
 
-__initfunc(static int cs89x0_probe1(struct device *dev, int ioaddr))
+static int __init cs89x0_probe1(struct device *dev, int ioaddr)
 {
 	struct net_local *lp;
 	static unsigned version_printed = 0;
@@ -390,10 +390,8 @@
 	return 0;
 }
 
-
-
-__initfunc(void
-reset_chip(struct device *dev))
+void  __init 
+reset_chip(struct device *dev)
 {
 	struct net_local *lp = (struct net_local *)dev->priv;
 	int ioaddr = dev->base_addr;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)