diff --git a/sys/dev/gpio/gpioaei.c b/sys/dev/gpio/gpioaei.c
--- a/sys/dev/gpio/gpioaei.c
+++ b/sys/dev/gpio/gpioaei.c
@@ -167,7 +167,7 @@
 
 		ctx->intr_rid = 0;
 		ctx->intr_res = gpio_alloc_intr_resource(sc->dev,
-		    &ctx->intr_rid, RF_ACTIVE, ctx->gpio,
+		    ctx->intr_rid, RF_ACTIVE, ctx->gpio,
 		    flags & GPIO_INTR_MASK);
 		if (ctx->intr_res == NULL) {
 			device_printf(sc->dev,
diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c
--- a/sys/dev/gpio/gpiobus.c
+++ b/sys/dev/gpio/gpiobus.c
@@ -92,7 +92,7 @@
 #ifdef INTRNG
 
 struct resource *
-gpio_alloc_intr_resource(device_t consumer_dev, int *rid, u_int alloc_flags,
+gpio_alloc_intr_resource(device_t consumer_dev, int rid, u_int alloc_flags,
     gpio_pin_t pin, uint32_t intr_mode)
 {
 	u_int irq;
@@ -116,7 +116,7 @@
 }
 #else
 struct resource *
-gpio_alloc_intr_resource(device_t consumer_dev, int *rid, u_int alloc_flags,
+gpio_alloc_intr_resource(device_t consumer_dev, int rid, u_int alloc_flags,
     gpio_pin_t pin, uint32_t intr_mode)
 {
 
diff --git a/sys/dev/gpio/gpiobusvar.h b/sys/dev/gpio/gpiobusvar.h
--- a/sys/dev/gpio/gpiobusvar.h
+++ b/sys/dev/gpio/gpiobusvar.h
@@ -166,7 +166,7 @@
 int gpio_pin_is_active(gpio_pin_t pin, bool *active);
 int gpio_pin_set_active(gpio_pin_t pin, bool active);
 int gpio_pin_setflags(gpio_pin_t pin, uint32_t flags);
-struct resource *gpio_alloc_intr_resource(device_t consumer_dev, int *rid,
+struct resource *gpio_alloc_intr_resource(device_t consumer_dev, int rid,
     u_int alloc_flags, gpio_pin_t pin, uint32_t intr_mode);
 
 int gpio_check_flags(uint32_t, uint32_t);
diff --git a/sys/dev/gpio/gpioc.c b/sys/dev/gpio/gpioc.c
--- a/sys/dev/gpio/gpioc.c
+++ b/sys/dev/gpio/gpioc.c
@@ -208,7 +208,7 @@
 		goto error_exit;
 
 	intr_conf->intr_res = gpio_alloc_intr_resource(sc->sc_dev,
-	    &intr_conf->intr_rid, RF_ACTIVE, intr_conf->pin, flags);
+	    intr_conf->intr_rid, RF_ACTIVE, intr_conf->pin, flags);
 	if (intr_conf->intr_res == NULL) {
 		err = ENXIO;
 		goto error_pin;
diff --git a/sys/dev/gpio/gpiokeys.c b/sys/dev/gpio/gpiokeys.c
--- a/sys/dev/gpio/gpiokeys.c
+++ b/sys/dev/gpio/gpiokeys.c
@@ -334,7 +334,7 @@
 		return;
 	}
 
-	key->irq_res = gpio_alloc_intr_resource(sc->sc_dev, &key->irq_rid,
+	key->irq_res = gpio_alloc_intr_resource(sc->sc_dev, key->irq_rid,
 	    RF_ACTIVE, key->pin, GPIO_INTR_EDGE_BOTH);
 	if (!key->irq_res) {
 		device_printf(sc->sc_dev, "<%s> cannot allocate interrupt\n", key_name);
diff --git a/sys/dev/gpio/gpiopps.c b/sys/dev/gpio/gpiopps.c
--- a/sys/dev/gpio/gpiopps.c
+++ b/sys/dev/gpio/gpiopps.c
@@ -218,7 +218,7 @@
 	 * Transform our 'gpios' property into an interrupt resource and set up
 	 * the interrupt.
 	 */
-	if ((sc->ires = gpio_alloc_intr_resource(dev, &sc->irid, RF_ACTIVE,
+	if ((sc->ires = gpio_alloc_intr_resource(dev, sc->irid, RF_ACTIVE,
 	    sc->gpin, edge)) == NULL) {
 		device_printf(dev, "Cannot allocate an IRQ for the GPIO\n");
 		gpiopps_detach(dev);
diff --git a/sys/dev/mmc/mmc_fdt_helpers.c b/sys/dev/mmc/mmc_fdt_helpers.c
--- a/sys/dev/mmc/mmc_fdt_helpers.c
+++ b/sys/dev/mmc/mmc_fdt_helpers.c
@@ -212,7 +212,7 @@
 	/*
 	 * Create an interrupt resource from the pin and set up the interrupt.
 	 */
-	if ((helper->cd_ires = gpio_alloc_intr_resource(dev, &helper->cd_irid,
+	if ((helper->cd_ires = gpio_alloc_intr_resource(dev, helper->cd_irid,
 	    RF_ACTIVE, helper->cd_pin, GPIO_INTR_EDGE_BOTH)) == NULL) {
 		if (bootverbose)
 			device_printf(dev, "Cannot allocate an IRQ for card "
diff --git a/sys/dev/sdhci/sdhci_fdt_gpio.c b/sys/dev/sdhci/sdhci_fdt_gpio.c
--- a/sys/dev/sdhci/sdhci_fdt_gpio.c
+++ b/sys/dev/sdhci/sdhci_fdt_gpio.c
@@ -128,7 +128,7 @@
 	/*
 	 * Create an interrupt resource from the pin and set up the interrupt.
 	 */
-	if ((gpio->cd_ires = gpio_alloc_intr_resource(dev, &gpio->cd_irid,
+	if ((gpio->cd_ires = gpio_alloc_intr_resource(dev, gpio->cd_irid,
 	    RF_ACTIVE, gpio->cd_pin, GPIO_INTR_EDGE_BOTH)) == NULL) {
 		if (bootverbose)
 			device_printf(dev, "Cannot allocate an IRQ for card "