diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index 7991e327915471..861352e1648d23 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -175,7 +175,7 @@ static int	cbb_cardbus_release_resource(device_t brdev, device_t child,
 		    int type, int rid, struct resource *res);
 static int	cbb_cardbus_power_enable_socket(device_t brdev,
 		    device_t child);
-static void	cbb_cardbus_power_disable_socket(device_t brdev,
+static int	cbb_cardbus_power_disable_socket(device_t brdev,
 		    device_t child);
 static int	cbb_func_filt(void *arg);
 static void	cbb_func_intr(void *arg);
@@ -998,11 +998,12 @@ cbb_cardbus_power_enable_socket(device_t brdev, device_t child)
 	return (0);
 }
 
-static void
+static int
 cbb_cardbus_power_disable_socket(device_t brdev, device_t child)
 {
 	cbb_power(brdev, CARD_OFF);
 	cbb_cardbus_reset(brdev, child, 0);
+	return (0);
 }
 
 /************************************************************************/
@@ -1262,7 +1263,7 @@ cbb_pcic_power_enable_socket(device_t brdev, device_t child)
 	return (0);
 }
 
-static void
+static int
 cbb_pcic_power_disable_socket(device_t brdev, device_t child)
 {
 	struct cbb_softc *sc = device_get_softc(brdev);
@@ -1282,6 +1283,7 @@ cbb_pcic_power_disable_socket(device_t brdev, device_t child)
 
 	/* enable CSC interrupts */
 	exca_putb(&sc->exca[0], EXCA_INTR, EXCA_INTR_ENABLE);
+	return (0);
 }
 
 /************************************************************************/
@@ -1295,18 +1297,16 @@ cbb_power_enable_socket(device_t brdev, device_t child)
 
 	if (sc->flags & CBB_16BIT_CARD)
 		return (cbb_pcic_power_enable_socket(brdev, child));
-	else
-		return (cbb_cardbus_power_enable_socket(brdev, child));
+	return (cbb_cardbus_power_enable_socket(brdev, child));
 }
 
-void
+int
 cbb_power_disable_socket(device_t brdev, device_t child)
 {
 	struct cbb_softc *sc = device_get_softc(brdev);
 	if (sc->flags & CBB_16BIT_CARD)
-		cbb_pcic_power_disable_socket(brdev, child);
-	else
-		cbb_cardbus_power_disable_socket(brdev, child);
+		return (cbb_pcic_power_disable_socket(brdev, child));
+	return (cbb_cardbus_power_disable_socket(brdev, child));
 }
 
 static int
@@ -1404,7 +1404,7 @@ cbb_pcic_release_resource(device_t brdev, device_t child, int type,
 
 int
 cbb_pcic_set_res_flags(device_t brdev, device_t child, int type, int rid,
-    uint32_t flags)
+    u_long flags)
 {
 	struct cbb_softc *sc = device_get_softc(brdev);
 	struct resource *res;
@@ -1579,9 +1579,9 @@ cbb_resume(device_t self)
 }
 
 int
-cbb_child_present(device_t self)
+cbb_child_present(device_t parent, device_t child)
 {
-	struct cbb_softc *sc = (struct cbb_softc *)device_get_softc(self);
+	struct cbb_softc *sc = (struct cbb_softc *)device_get_softc(parent);
 	uint32_t sockstate;
 
 	sockstate = cbb_get(sc, CBB_SOCKET_STATE);
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c
index 86e52b206db978..b8582b78fee2ef 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -785,20 +785,17 @@ cbb_maxslots(device_t brdev)
 }
 
 static uint32_t
-cbb_read_config(device_t brdev, int b, int s, int f, int reg, int width)
+cbb_read_config(device_t brdev, u_int b, u_int s, u_int f, u_int reg, int width)
 {
-	uint32_t rv;
-
 	/*
 	 * Pass through to the next ppb up the chain (i.e. our grandparent).
 	 */
-	rv = PCIB_READ_CONFIG(device_get_parent(device_get_parent(brdev)),
-	    b, s, f, reg, width);
-	return (rv);
+	return (PCIB_READ_CONFIG(device_get_parent(device_get_parent(brdev)),
+	    b, s, f, reg, width));
 }
 
 static void
-cbb_write_config(device_t brdev, int b, int s, int f, int reg, uint32_t val,
+cbb_write_config(device_t brdev, u_int b, u_int s, u_int f, u_int reg, uint32_t val,
     int width)
 {
 	/*
diff --git a/sys/dev/pccbb/pccbbvar.h b/sys/dev/pccbb/pccbbvar.h
index a7b6aa60ce5795..a38e82e617d9fc 100644
--- a/sys/dev/pccbb/pccbbvar.h
+++ b/sys/dev/pccbb/pccbbvar.h
@@ -116,7 +116,7 @@ struct resource	*cbb_alloc_resource(device_t brdev, device_t child,
 	    int type, int *rid, u_long start, u_long end, u_long count,
 	    u_int flags);
 void	cbb_child_detached(device_t brdev, device_t child);
-int	cbb_child_present(device_t self);
+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);
 int	cbb_detach(device_t brdev);
@@ -126,10 +126,10 @@ void	cbb_event_thread(void *arg);
 int	cbb_pcic_set_memory_offset(device_t brdev, device_t child, int rid,
 	    uint32_t cardaddr, uint32_t *deltap);
 int	cbb_pcic_set_res_flags(device_t brdev, device_t child, int type,
-	    int rid, uint32_t flags);
+	    int rid, u_long flags);
 int	cbb_power(device_t brdev, int volts);
 int	cbb_power_enable_socket(device_t brdev, device_t child);
-void	cbb_power_disable_socket(device_t brdev, device_t child);
+int	cbb_power_disable_socket(device_t brdev, device_t child);
 int	cbb_read_ivar(device_t brdev, device_t child, int which,
 	    uintptr_t *result);
 int	cbb_release_resource(device_t brdev, device_t child,