From nobody Tue Dec 9 20:12:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dQqlV0Y1Wz6Jkmj for ; Tue, 09 Dec 2025 20:12:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dQqlS6k9cz3wfq for ; Tue, 09 Dec 2025 20:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765311157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8NG6MeYpB1OY/psHaKa1oQx66D+rqaveqyC0ZwjdxBs=; b=JFLA+tuDZ16D9+PQumNHVMODjPH3FkvyjgiqbLH8XSWp/fHDiUjfVGgdHkhnr05wciLNWA oArZv5TRCDL5yuptBp6nv36rljbroF4BKOgWlVfnR9wz/BI+tUQxsfbGaHb2YSwPM28KHn punwCkWGldIBgiVTqC4s+oznbLYLSC/PdVFWh8wctVP/S20zhIUpn5HiA78KR2mlvy9y2y eUwnOT2X4Jvg98tiyDI9wisnbpWHw4IFlLBsIWfoBzjQcUbweBby5cDjMZ7O02T9+uo5tc E5W6ksRR+2byImUSK9p8gYK9zVV6Q5YhG5sVdfUoOPX4tFrnddFeY1mgtUTM7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765311157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8NG6MeYpB1OY/psHaKa1oQx66D+rqaveqyC0ZwjdxBs=; b=oGWH37oxCzwUGsunTJFmBYETWcBIKZ1VD6onzvo/lhcLJg7dz7xcQ93v0SthmVUpdkRiYf urw9IMOksG7srGAJB7/j4eTdrW+OXd8Re3/t5QJ7e83fVTUaKlVlOt4tblKsDC3/3rnGEM TKqesL9ygyXC6e+kduF10hGOlWhW/nqTljJXkE2+YPxqP7/Ey129QZYmeqejTyPZJTi7wP hWmtInJ9nlQOiX5Gt9VdOC83OY8E1kMLAGDkctjDEtzl3F4lA500lM8j85QkOcyaOJDf8f SGQ5f+q/+wdmrQ6i/uY0xkyHWFdUL20P6/LHsTYBb2y8qxBtio1loxTZep5gpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765311157; a=rsa-sha256; cv=none; b=LuOK6oVuezhcm/rny2Kar+nvQMlxoy7R+WEfKHxwsKubeg4URPcap8gVcPjLZBq3wAnhqm IBFl4/z1B7wpYJ+Uis5ldbRNgp878pQGXtt6MDgF5u/1oryitZ4yt1f/wUqwxBmOJA/O7f tuKanBVvO6aVTtZJNAK+KYltrx7AJxwipHO+CscIS5F4U41DE5mTkmSbMqwZJ7X9bYe+8n ZgH+LxT1AGmqM7F1gkZNZmQW9UzagHxskcq8lb3Ymd+OqcBoGvlRTLq9zMMohcJnJTUR6o 0tnymLgw7p4QMW0S0AzFF4BLlkCIiFy8IHcvilcjJBHKX7UJZHJwWM9bLMw2IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dQqlS6BFKz1CxT for ; Tue, 09 Dec 2025 20:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 312d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Dec 2025 20:12:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 01dcb4e6645f - main - gpio_alloc_intr_resource: Pass rid by value List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01dcb4e6645f1a551e52763d58ba4375efbc5428 Auto-Submitted: auto-generated Date: Tue, 09 Dec 2025 20:12:36 +0000 Message-Id: <693882b4.312d9.7a40d6a@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=01dcb4e6645f1a551e52763d58ba4375efbc5428 commit 01dcb4e6645f1a551e52763d58ba4375efbc5428 Author: John Baldwin AuthorDate: 2025-12-09 20:03:03 +0000 Commit: John Baldwin CommitDate: 2025-12-09 20:03:03 +0000 gpio_alloc_intr_resource: Pass rid by value Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D53407 --- sys/dev/gpio/gpioaei.c | 2 +- sys/dev/gpio/gpiobus.c | 4 ++-- sys/dev/gpio/gpiobusvar.h | 2 +- sys/dev/gpio/gpioc.c | 2 +- sys/dev/gpio/gpiokeys.c | 2 +- sys/dev/gpio/gpiopps.c | 2 +- sys/dev/mmc/mmc_fdt_helpers.c | 2 +- sys/dev/sdhci/sdhci_fdt_gpio.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/dev/gpio/gpioaei.c b/sys/dev/gpio/gpioaei.c index 7b97277aaf61..9a769a793e5a 100644 --- a/sys/dev/gpio/gpioaei.c +++ b/sys/dev/gpio/gpioaei.c @@ -167,7 +167,7 @@ gpio_aei_enumerate(ACPI_RESOURCE * res, void * context) 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 index 848abe025f52..3563435965de 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -92,7 +92,7 @@ static int gpiobus_pin_toggle(device_t, device_t, uint32_t); #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 @@ gpio_alloc_intr_resource(device_t consumer_dev, int *rid, u_int alloc_flags, } #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 index 0528efe45525..22a10ad2abc2 100644 --- a/sys/dev/gpio/gpiobusvar.h +++ b/sys/dev/gpio/gpiobusvar.h @@ -166,7 +166,7 @@ int gpio_pin_getcaps(gpio_pin_t pin, uint32_t *caps); 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 index 517f7752daad..d26821395e55 100644 --- a/sys/dev/gpio/gpioc.c +++ b/sys/dev/gpio/gpioc.c @@ -208,7 +208,7 @@ gpioc_allocate_pin_intr(struct gpioc_softc *sc, 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 index a3180f046c58..deb5a0ab16a4 100644 --- a/sys/dev/gpio/gpiokeys.c +++ b/sys/dev/gpio/gpiokeys.c @@ -334,7 +334,7 @@ gpiokeys_attach_key(struct gpiokeys_softc *sc, phandle_t node, 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 index 82620a50a798..c2252e947dd0 100644 --- a/sys/dev/gpio/gpiopps.c +++ b/sys/dev/gpio/gpiopps.c @@ -218,7 +218,7 @@ gpiopps_fdt_attach(device_t dev) * 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 index 980785464a00..086b91f20ef3 100644 --- a/sys/dev/mmc/mmc_fdt_helpers.c +++ b/sys/dev/mmc/mmc_fdt_helpers.c @@ -212,7 +212,7 @@ cd_setup(struct mmc_helper *helper, phandle_t node) /* * 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 index e71c5e3eaf93..7e7e461e76b0 100644 --- a/sys/dev/sdhci/sdhci_fdt_gpio.c +++ b/sys/dev/sdhci/sdhci_fdt_gpio.c @@ -128,7 +128,7 @@ cd_setup(struct sdhci_fdt_gpio *gpio, phandle_t node) /* * 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 "