[PATCH] 3c59x EISA tidyup

From: Marc Zyngier <mzyngier@freesurf.fr>

The included patch helps 3c59x to display the correct identification
string (3c592 and 3c597 were displayed as 3c590). It also gets rid of
the EISA_bus reference, which is not needed anymore since the driver
has been ported to the EISA probing API.

drivers/net/3c59x.c

@@ -479,11 +479,12 @@ static struct vortex_chip_info {
 	int drv_flags;
 	int io_size;
 } vortex_info_tbl[] __devinitdata = {
-#define EISA_TBL_OFFSET	0		/* Offset of this entry for vortex_eisa_init */
 	{"3c590 Vortex 10Mbps",
 	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
+#define EISA_3C592_OFFSET 1		/* Offset of this entry for vortex_eisa_init */
 	{"3c592 EISA 10Mbps Demon/Vortex",					/* AKPM: from Don's 3c59x_cb.c 0.49H */
 	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
+#define EISA_3C597_OFFSET 2		/* Offset of this entry for vortex_eisa_init */
 	{"3c597 EISA Fast Demon/Vortex",					/* AKPM: from Don's 3c59x_cb.c 0.49H */
 	 PCI_USES_IO|PCI_USES_MASTER, IS_VORTEX, 32, },
 	{"3c595 Vortex 100baseTx",
@@ -947,8 +948,8 @@ static int vortex_resume (struct pci_dev *pdev)
 
 #ifdef CONFIG_EISA
 static struct eisa_device_id vortex_eisa_ids[] = {
-	{ "TCM5920" },
-	{ "TCM5970" },
+	{ "TCM5920", EISA_3C592_OFFSET },
+	{ "TCM5970", EISA_3C597_OFFSET },
 	{ "" }
 };
 
@@ -976,7 +977,7 @@ static int vortex_eisa_probe (struct device *device)
 		return -EBUSY;
 
 	if (vortex_probe1(device, ioaddr, inw(ioaddr + 0xC88) >> 12,
-					  EISA_TBL_OFFSET, vortex_cards_found)) {
+					  edev->id.driver_data, vortex_cards_found)) {
 		release_region (ioaddr, VORTEX_TOTAL_SIZE);
 		return -ENODEV;
 	}
@@ -1019,10 +1020,6 @@ static int __init vortex_eisa_init (void)
 	int eisa_found = 0;
 	int orig_cards_found = vortex_cards_found;
 
-	/* Now check all slots of the EISA bus. */
-	if (!EISA_bus)
-		return 0;
-
 #ifdef CONFIG_EISA
 	if (eisa_driver_register (&vortex_eisa_driver) >= 0) {
 			/* Because of the way EISA bus is probed, we cannot assume