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

• Lines: 37
• Date: Wed Nov 10 19:55:03 1999
• Orig file: v2.3.26/linux/drivers/net/mace.c
• Orig date: Wed Aug 18 11:36:42 1999

diff -u --recursive --new-file v2.3.26/linux/drivers/net/mace.c linux/drivers/net/mace.c
@@ -101,10 +101,10 @@
     return d;
 }
 
-int
-mace_probe(struct net_device *dev)
+int mace_probe(void)
 {
 	int j, rev;
+	struct net_device *dev;
 	struct mace_data *mp;
 	struct device_node *mace;
 	unsigned char *addr;
@@ -126,13 +126,7 @@
 		return -ENODEV;
 	}
 
-	if (dev == NULL)
-		dev = init_etherdev(0, PRIV_BYTES);
-	else {
-		dev->priv = kmalloc(PRIV_BYTES, GFP_KERNEL);
-		if (dev->priv == 0)
-			return -ENOMEM;
-	}
+	dev = init_etherdev(0, PRIV_BYTES);
 	memset(dev->priv, 0, PRIV_BYTES);
 
 	mp = (struct mace_data *) dev->priv;
@@ -913,7 +907,7 @@
 
     if(mace_devs != NULL)
 	return -EBUSY;
-    res = mace_probe(NULL);
+    res = mace_probe();
     return res;
 }