Last change to pccard_nbk now obviates the need to check the name of

the device in question.
Also fix warnings on if_ep_pccard.c

4 files changed, 6 insertions, 32 deletions

diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c
index 3eec531..db1eac8 100644
--- a/sys/dev/ed/if_ed_pccard.c
+++ b/sys/dev/ed/if_ed_pccard.c
@@ -108,13 +108,7 @@ static int
 ed_pccard_probe(device_t dev)
 {
 	int     error;
-	const char *name;
 
-	name = pccard_get_name(dev);
-	printf("ed_pccard_probe: Does %s match?\n", name);
-	if (strcmp(name, "ed"))
-		return ENXIO;
-	  
 	error = ed_probe_WD80x3(dev);
 	if (error == 0)
 		goto end;
diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c
index 84a438c..fb373d0 100644
--- a/sys/dev/ep/if_ep_pccard.c
+++ b/sys/dev/ep/if_ep_pccard.c
@@ -73,17 +73,11 @@ ep_pccard_probe(device_t dev)
 {
 	struct ep_softc *	sc = device_get_softc(dev);
 	struct ep_board *	epb = &sc->epb;
-	u_int32_t		port_start;
-	u_int32_t		port_count;
+	u_long			port_start;
+	u_long			port_count;
 	const char *		desc;
-	const char *		name;
 	int			error;
 
-	name = pccard_get_name(dev);
-	printf("ep_pccard_probe: Does %s match?\n", name);
-	if (strcmp(name, "ep"))
-		return ENXIO;
-	  
 	error = bus_get_resource(dev, SYS_RES_IOPORT, 0,
 				 &port_start, &port_count);
 	if (error != 0)
@@ -162,7 +156,7 @@ ep_pccard_attach(device_t dev)
 	struct ep_softc *	sc = device_get_softc(dev);
 	int			error = 0;
 
-	if (error = ep_alloc(dev)) {
+	if ((error = ep_alloc(dev))) {
 		device_printf(dev, "ep_alloc() failed! (%d)\n", error);
 		goto bad;
 	}
@@ -210,15 +204,15 @@ ep_pccard_attach(device_t dev)
 		goto bad;
 	}
 
-	if (error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, ep_intr,
-				   sc, &sc->ep_intrhand)) {
+	if ((error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, ep_intr,
+				    sc, &sc->ep_intrhand))) {
 		device_printf(dev, "bus_setup_intr() failed! (%d)\n", error);
 		goto bad;
 	}
 
 	return (0);
 bad:
-	ep_free(sc);
+	ep_free(dev);
 	return (error);
 }
 
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 30b2b48..8ec8bd0 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -489,13 +489,6 @@ static int
 sio_pccard_probe(dev)
 	device_t	dev;
 {
-	const char *name;
-
-	name = pccard_get_name(dev);
-	printf("sio_pccard_probe: Does %s match?\n", name);
-	if (strcmp(name, "sio"))
-		return ENXIO;
-
 	return (sioprobe(dev));
 }
 
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 30b2b48..8ec8bd0 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -489,13 +489,6 @@ static int
 sio_pccard_probe(dev)
 	device_t	dev;
 {
-	const char *name;
-
-	name = pccard_get_name(dev);
-	printf("sio_pccard_probe: Does %s match?\n", name);
-	if (strcmp(name, "sio"))
-		return ENXIO;
-
 	return (sioprobe(dev));
 }