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

• Lines: 51
• Date: Tue Nov 9 08:20:12 1999
• Orig file: v2.3.26/linux/drivers/net/rrunner.c
• Orig date: Wed Aug 18 11:36:42 1999

diff -u --recursive --new-file v2.3.26/linux/drivers/net/rrunner.c linux/drivers/net/rrunner.c
@@ -72,10 +72,11 @@
 
 static int probed __initdata = 0;
 
-int __init rr_hippi_probe (struct net_device *dev)
+int __init rr_hippi_probe (void)
 {
 	int boards_found = 0;
 	int version_disp;	/* was version info already displayed? */
+	struct net_device *dev;
 	struct pci_dev *pdev = NULL;
 	struct pci_dev *opdev = NULL;
 	u8 pci_latency;
@@ -101,7 +102,7 @@
 		 * So we found our HIPPI ... time to tell the system.
 		 */
 
-		dev = init_hippi_dev(dev, sizeof(struct rr_private));
+		dev = init_hippi_dev(NULL, sizeof(struct rr_private));
 
 		if (!dev)
 			break;
@@ -192,14 +193,7 @@
 	 * 1 or more boards. Otherwise, return failure (-ENODEV).
 	 */
 
-#ifdef MODULE
 	return boards_found;
-#else
-	if (boards_found > 0)
-		return 0;
-	else
-		return -ENODEV;
-#endif
 }
 
 static struct net_device *root_dev = NULL;
@@ -213,12 +207,7 @@
 
 int init_module(void)
 {
-	int cards;
-
-	root_dev = NULL;
-
-	cards = rr_hippi_probe(NULL);
-	return cards ? 0 : -ENODEV;
+	return rr_hippi_probe()? 0 : -ENODEV;
 }
 
 void cleanup_module(void)