patch-2.3.27 linux/drivers/net/ncr885e.c

• Lines: 64
• Date: Wed Nov 10 10:00:48 1999
• Orig file: v2.3.26/linux/drivers/net/ncr885e.c
• Orig date: Mon Oct 11 15:38:14 1999

diff -u --recursive --new-file v2.3.26/linux/drivers/net/ncr885e.c linux/drivers/net/ncr885e.c
@@ -33,7 +33,6 @@
 #include <linux/malloc.h>
 #include <linux/netdevice.h>
 #include <linux/pci.h>
-#include <linux/malloc.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/errno.h>
@@ -134,8 +133,7 @@
 static int ncr885e_close( struct net_device *dev );
 static void ncr885e_rx( struct net_device *dev );
 static void ncr885e_tx( struct net_device *dev );
-static int ncr885e_probe1( struct net_device *dev, unsigned long ioaddr,
-			   unsigned char irq );
+static int ncr885e_probe1( unsigned long ioaddr, unsigned char irq );
 static int ncr885e_xmit_start( struct sk_buff *skb, struct net_device *dev );
 static struct net_device_stats *ncr885e_stats( struct net_device *dev );
 static void ncr885e_set_multicast( struct net_device *dev );
@@ -1162,15 +1160,16 @@
  */
 
 static int
-ncr885e_probe1( struct net_device *dev, unsigned long ioaddr, unsigned char irq )
+ncr885e_probe1(unsigned long ioaddr, unsigned char irq )
 
 {
+	struct net_device *dev;
 	struct ncr885e_private *sp;
 	unsigned short station_addr[3], val;
 	unsigned char *p;
 	int  i;
 
-	dev = init_etherdev( dev, 0 );
+	dev = init_etherdev(NULL, 0 );
 
 	/* construct private data for the 885 ethernet */
 	dev->priv = kmalloc( sizeof( struct ncr885e_private ), GFP_KERNEL );
@@ -1227,7 +1226,7 @@
  *  worry about the rest.
  */
 
-int __init ncr885e_probe( struct net_device *dev )
+int __init ncr885e_probe(void)
 {
 	struct pci_dev *pdev = NULL;
 	unsigned int ioaddr, chips = 0;
@@ -1257,7 +1256,7 @@
 			continue;
 
 		/* finish off the probe */
-		if ( !(ncr885e_probe1( dev, ioaddr, irq ))) {
+		if ( !(ncr885e_probe1(ioaddr, irq ))) {
 
 			chips++;
 
@@ -1432,7 +1431,7 @@
 	if ( debug >= 0)
 		ncr885e_debug = debug;
 
-	return ncr885e_probe( NULL );
+	return ncr885e_probe();
 }
 
 void