diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c
index 552d32d65c71..6269889bdff6 100644
--- a/sys/dev/cardbus/cardbus_cis.c
+++ b/sys/dev/cardbus/cardbus_cis.c
@@ -316,7 +316,7 @@ decode_tuple_bar(device_t cbdev, device_t child, int id,
 
 	if (type == SYS_RES_MEMORY) {
 		if (reg & TPL_BAR_REG_PREFETCHABLE)
-			dinfo->mprefetchable |= BARBIT(bar);
+			dinfo->mprefetchable |= PCI_RID2BAR(bar);
 #if 0
 		/*
 		 * XXX: It appears from a careful reading of the spec
@@ -338,7 +338,7 @@ decode_tuple_bar(device_t cbdev, device_t child, int id,
 		 * correctness.
 		 */
 		if (reg & TPL_BAR_REG_BELOW1MB)
-			dinfo->mbelow1mb |= BARBIT(bar);
+			dinfo->mbelow1mb |= PCI_RID2BAR(bar);
 #endif
 	}
 
@@ -360,9 +360,9 @@ decode_tuple_bar(device_t cbdev, device_t child, int id,
 
 	DEVPRINTF((cbdev, "Opening BAR: type=%s, bar=%02x, len=%04x%s%s\n",
 	    (type == SYS_RES_MEMORY) ? "MEM" : "IO", bar, len,
-	    (type == SYS_RES_MEMORY && dinfo->mprefetchable & BARBIT(bar)) ?
+	    (type == SYS_RES_MEMORY && dinfo->mprefetchable & PCI_RID2BAR(bar)) ?
 	    " (Prefetchable)" : "", type == SYS_RES_MEMORY ?
-	    ((dinfo->mbelow1mb & BARBIT(bar)) ? " (Below 1Mb)" : "") : ""));
+	    ((dinfo->mbelow1mb & PCI_RID2BAR(bar)) ? " (Below 1Mb)" : "") : ""));
 
 	resource_list_add(&dinfo->pci.resources, type, bar, 0UL, ~0UL, len);
 
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index 4cbc3c4ca898..713288453f7c 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -35,7 +35,6 @@ struct cardbus_devinfo
 	uint8_t        mprefetchable; /* bit mask of prefetchable BARs */
 	uint8_t        mbelow1mb; /* bit mask of BARs which require below 1Mb */
 	uint8_t        ibelow1mb; /* bit mask of BARs which require below 1Mb */
-#define        BARBIT(RID) (1<<(((RID)-PCIR_BARS)/4))
 	uint16_t	mfrid;		/* manufacturer id */
 	uint16_t	prodid;		/* product id */
 	u_int		funcid;		/* function id */