4 files changed, 17 insertions, 18 deletions

diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
index 2da4d9d..d718938 100644
--- a/sys/dev/advansys/adv_eisa.c
+++ b/sys/dev/advansys/adv_eisa.c
@@ -145,16 +145,15 @@ adv_eisa_attach(device_t dev)
 	adv_b = NULL;
 
 	rid = 0;
-	io = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
-				0, ~0, 1, RF_ACTIVE);
+	io = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE);
 	if (!io) {
 		device_printf(dev, "No I/O space?!\n");
 		return ENOMEM;
 	}
 
 	rid = 0;
-	irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid,
-				 0, ~0, 1, RF_SHAREABLE | RF_ACTIVE);
+	irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+				     RF_SHAREABLE | RF_ACTIVE);
 	if (!irq) {
 		device_printf(dev, "No irq?!\n");
 		bus_release_resource(dev, SYS_RES_IOPORT, 0, io);
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index 0a4e759..5b51ce1 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -158,8 +158,8 @@ adv_isa_probe(device_t dev)
 			continue;
 
 		/* XXX what is the real portsize? */
-		iores = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1,
-					   RF_ACTIVE);
+		iores = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+					       RF_ACTIVE);
 		if (iores == NULL)
 			continue;
 
@@ -327,8 +327,8 @@ adv_isa_probe(device_t dev)
 		else
 			adv_set_chip_irq(adv, irq);
 
-		irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
-					    RF_ACTIVE);
+		irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+						RF_ACTIVE);
 		if (irqres == NULL ||
 		    bus_setup_intr(dev, irqres, INTR_TYPE_CAM|INTR_ENTROPY,
 				   adv_intr, adv, &ih)) {
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index e4ba944..fd704b3 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -169,8 +169,8 @@ adv_pci_attach(device_t dev)
 	}
 
 	rid = PCI_BASEADR0;
-	iores = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, 0, ~0, 1,
-				   RF_ACTIVE);
+	iores = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
+				       RF_ACTIVE);
 	if (iores == NULL)
 		return ENXIO;
 
@@ -306,8 +306,8 @@ adv_pci_attach(device_t dev)
 	}
 
 	irqrid = 0;
-	irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &irqrid, 0, ~0, 1,
-				    RF_SHAREABLE | RF_ACTIVE);
+	irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &irqrid,
+					RF_SHAREABLE | RF_ACTIVE);
 	if (irqres == NULL ||
 	    bus_setup_intr(dev, irqres, INTR_TYPE_CAM|INTR_ENTROPY, adv_intr, adv, &ih)) {
 		adv_free(adv);
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index 578cb37..e6050b8 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -217,15 +217,15 @@ adw_pci_attach(device_t dev)
 	if ((command & PCIM_CMD_MEMEN) != 0) {
 		regs_type = SYS_RES_MEMORY;
 		regs_id = ADW_PCI_MEMBASE;
-		regs = bus_alloc_resource(dev, regs_type,
-					  &regs_id, 0, ~0, 1, RF_ACTIVE);
+		regs = bus_alloc_resource_any(dev, regs_type,
+					      &regs_id, RF_ACTIVE);
 	}
 #endif
 	if (regs == NULL && (command & PCIM_CMD_PORTEN) != 0) {
 		regs_type = SYS_RES_IOPORT;
 		regs_id = ADW_PCI_IOBASE;
-		regs = bus_alloc_resource(dev, regs_type,
-					  &regs_id, 0, ~0, 1, RF_ACTIVE);
+		regs = bus_alloc_resource_any(dev, regs_type,
+					      &regs_id, RF_ACTIVE);
 	}
 
 	if (regs == NULL) {
@@ -305,8 +305,8 @@ adw_pci_attach(device_t dev)
 
 	zero = 0;
 	adw->irq_res_type = SYS_RES_IRQ;
-	adw->irq = bus_alloc_resource(dev, adw->irq_res_type, &zero,
-				      0, ~0, 1, RF_ACTIVE | RF_SHAREABLE);
+	adw->irq = bus_alloc_resource_any(dev, adw->irq_res_type, &zero,
+					  RF_ACTIVE | RF_SHAREABLE);
 	if (adw->irq == NULL) {
 		adw_free(adw);
 		return (ENOMEM);