2 files changed, 24 insertions, 29 deletions

diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index b2a94cc04bb0..302b9d75c864 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -155,9 +155,9 @@ static int	cbb_cardbus_mem_open(device_t brdev, int win,
 		    uint32_t start, uint32_t end);
 static void	cbb_cardbus_auto_open(struct cbb_softc *sc, int type);
 static int	cbb_cardbus_activate_resource(device_t brdev, device_t child,
-		    int type, int rid, struct resource *res);
+		    struct resource *res);
 static int	cbb_cardbus_deactivate_resource(device_t brdev,
-		    device_t child, int type, int rid, struct resource *res);
+		    device_t child, struct resource *res);
 static struct resource	*cbb_cardbus_alloc_resource(device_t brdev,
 		    device_t child, int type, int *rid, rman_res_t start,
 		    rman_res_t end, rman_res_t count, u_int flags);
@@ -1175,30 +1175,30 @@ cbb_cardbus_auto_open(struct cbb_softc *sc, int type)
 }
 
 static int
-cbb_cardbus_activate_resource(device_t brdev, device_t child, int type,
-    int rid, struct resource *res)
+cbb_cardbus_activate_resource(device_t brdev, device_t child,
+    struct resource *res)
 {
 	int ret;
 
 	ret = BUS_ACTIVATE_RESOURCE(device_get_parent(brdev), child,
-	    type, rid, res);
+	    res);
 	if (ret != 0)
 		return (ret);
-	cbb_cardbus_auto_open(device_get_softc(brdev), type);
+	cbb_cardbus_auto_open(device_get_softc(brdev), rman_get_type(res));
 	return (0);
 }
 
 static int
-cbb_cardbus_deactivate_resource(device_t brdev, device_t child, int type,
-    int rid, struct resource *res)
+cbb_cardbus_deactivate_resource(device_t brdev, device_t child,
+    struct resource *res)
 {
 	int ret;
 
 	ret = BUS_DEACTIVATE_RESOURCE(device_get_parent(brdev), child,
-	    type, rid, res);
+	    res);
 	if (ret != 0)
 		return (ret);
-	cbb_cardbus_auto_open(device_get_softc(brdev), type);
+	cbb_cardbus_auto_open(device_get_softc(brdev), rman_get_type(res));
 	return (0);
 }
 
@@ -1347,24 +1347,24 @@ cbb_power_disable_socket(device_t brdev, device_t child)
 }
 
 static int
-cbb_pcic_activate_resource(device_t brdev, device_t child, int type, int rid,
+cbb_pcic_activate_resource(device_t brdev, device_t child,
     struct resource *res)
 {
 	struct cbb_softc *sc = device_get_softc(brdev);
 	int error;
 
-	error = exca_activate_resource(&sc->exca, child, type, rid, res);
+	error = exca_activate_resource(&sc->exca, child, res);
 	if (error == 0)
-		cbb_activate_window(brdev, type);
+		cbb_activate_window(brdev, rman_get_type(res));
 	return (error);
 }
 
 static int
-cbb_pcic_deactivate_resource(device_t brdev, device_t child, int type,
-    int rid, struct resource *res)
+cbb_pcic_deactivate_resource(device_t brdev, device_t child,
+    struct resource *res)
 {
 	struct cbb_softc *sc = device_get_softc(brdev);
-	return (exca_deactivate_resource(&sc->exca, child, type, rid, res));
+	return (exca_deactivate_resource(&sc->exca, child, res));
 }
 
 static struct resource *
@@ -1483,30 +1483,25 @@ cbb_pcic_set_memory_offset(device_t brdev, device_t child, int rid,
 /************************************************************************/
 
 int
-cbb_activate_resource(device_t brdev, device_t child, int type, int rid,
-    struct resource *r)
+cbb_activate_resource(device_t brdev, device_t child, struct resource *r)
 {
 	struct cbb_softc *sc = device_get_softc(brdev);
 
 	if (sc->flags & CBB_16BIT_CARD)
-		return (cbb_pcic_activate_resource(brdev, child, type, rid, r));
+		return (cbb_pcic_activate_resource(brdev, child, r));
 	else
-		return (cbb_cardbus_activate_resource(brdev, child, type, rid,
-		    r));
+		return (cbb_cardbus_activate_resource(brdev, child, r));
 }
 
 int
-cbb_deactivate_resource(device_t brdev, device_t child, int type,
-    int rid, struct resource *r)
+cbb_deactivate_resource(device_t brdev, device_t child, struct resource *r)
 {
 	struct cbb_softc *sc = device_get_softc(brdev);
 
 	if (sc->flags & CBB_16BIT_CARD)
-		return (cbb_pcic_deactivate_resource(brdev, child, type,
-		    rid, r));
+		return (cbb_pcic_deactivate_resource(brdev, child, r));
 	else
-		return (cbb_cardbus_deactivate_resource(brdev, child, type,
-		    rid, r));
+		return (cbb_cardbus_deactivate_resource(brdev, child, r));
 }
 
 struct resource *
diff --git a/sys/dev/pccbb/pccbbvar.h b/sys/dev/pccbb/pccbbvar.h
index 690f215ee302..5d6529070a12 100644
--- a/sys/dev/pccbb/pccbbvar.h
+++ b/sys/dev/pccbb/pccbbvar.h
@@ -108,14 +108,14 @@ struct cbb_softc {
 extern int cbb_debug;
 
 int	cbb_activate_resource(device_t brdev, device_t child,
-	    int type, int rid, struct resource *r);
+	    struct resource *r);
 struct resource	*cbb_alloc_resource(device_t brdev, device_t child,
 	    int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count,
 	    u_int flags);
 void	cbb_child_detached(device_t brdev, device_t child);
 int	cbb_child_present(device_t parent, device_t child);
 int	cbb_deactivate_resource(device_t brdev, device_t child,
-	    int type, int rid, struct resource *r);
+	    struct resource *r);
 int	cbb_detach(device_t brdev);
 void	cbb_disable_func_intr(struct cbb_softc *sc);
 void	cbb_driver_added(device_t brdev, driver_t *driver);