From nobody Wed Aug 20 06:59:47 2025 X-Original-To: dev-commits-src-main@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 4c6HPw2V7wz64VJ1; Wed, 20 Aug 2025 06:59:48 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6HPw16PNz3VKm; Wed, 20 Aug 2025 06:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673188; 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=mJmg0QZauWRB/SrpshwgV6J9IS3zJ6rdWfhYR45tqV8=; b=WQHxW4x9g8qAZC+1pB9LoZHNviI5r7kppPq2EnOBD8ZliUujOdcM1GWjIebVEwfS4G4t5P PG04VFKMOh7SXA0P2O3jiqoKLRVRebs9yPmTF1pIsLHS1NsdZhgPDYfMjPBuNIoP6sSfro 2iyKLh2PAn/knApE4i7njqpN/gQX+FwA92ohGJsvV6VBfdh2YCoaEGo9/VUiG+r0aIH9qL APWs/RKo0dZJvb6wB11mp3xAmiNHFR17wP8gqiwDUwWa4QbHXmB3AvStiYgU7Xc8Gc5BPb +m4cpUt3U/25Kde0RE+K86iDUtAXWSZCUpkGl3Wjq1BrUMLp3szld8xC6fTpqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755673188; 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=mJmg0QZauWRB/SrpshwgV6J9IS3zJ6rdWfhYR45tqV8=; b=cxqwmCwsWsvFhH5q8AJxJcZSSoKBV3rsg3kGntDkVy1ZcSkem4wlfCDtFA1p5XVw4MX3UY /z33Z1kVXc2SlIUpC8DjZ1E0ArHgSMygjRVmojDAW3plIq2H3ozf4/SCaQYh+K9R3mr6ni o3MhXqPw9j+GyyGOIhKJGlW3uWqwC6IRqOaGrizEH2L1uH5SMFltjDcAxoWNi8GFnzDBBN i4QQep2JfM4MbYrgf0ME1GzAus/Fd+o6yG9HVXSQFJ0Vg19pcJGz7r1x8g+ziD94FhZWik 2/6lKCgtOsCY1DVuMU7V4D4FgfvHpUZy1oBUklAibzdtmlrhLMaUkQ0VEnRrWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755673188; a=rsa-sha256; cv=none; b=NVR8NYfctGjiFpQmrFuA/obr9/WbHYbyMjM0V7+a+2VNlusgqbKx2WFn2MMBDMkA9LhsZm I2fX7LvqElPhwF5uCG30HcXc4mY0yIwo3i0x38o80kNgL4amW1ZwoZrafHSuYeaj5vc3li sK2TCfwtZIq4N4VgM0ROg+/Vl4ZrHaD73aONt9feM4HKbiGCoxQw5qm5a5PN4ZWieKl+gs JkzM7YYJEd/dNML4rN6cDo50b0TVBKQkX9GKOZqehAcqCbCWu+hzmt4qJk/KKE1yH0qH3J GiCjuvmP7NkrF++Gl2MGIaEsWjw6CfJ6VD8Bcu+No/P6wNMXpHScLHpPmSW0Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6HPw0P0Pz13Cq; Wed, 20 Aug 2025 06:59:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57K6xlqU024091; Wed, 20 Aug 2025 06:59:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57K6xlOp024088; Wed, 20 Aug 2025 06:59:47 GMT (envelope-from git) Date: Wed, 20 Aug 2025 06:59:47 GMT Message-Id: <202508200659.57K6xlOp024088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: 7f53cf7e1e89 - main - gpiobus: factorize common add_child code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f53cf7e1e8902dec78f6831e69a89e424169acf Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=7f53cf7e1e8902dec78f6831e69a89e424169acf commit 7f53cf7e1e8902dec78f6831e69a89e424169acf Author: Ahmad Khalifa AuthorDate: 2025-08-20 06:03:25 +0000 Commit: Ahmad Khalifa CommitDate: 2025-08-20 06:03:25 +0000 gpiobus: factorize common add_child code Move common bus_add_child code to gpiobus_add_child_common. Reviewed by: andrew Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D51582 --- sys/dev/gpio/gpiobus.c | 16 +++++++++++++--- sys/dev/gpio/gpiobus_internal.h | 1 + sys/dev/gpio/ofw_gpiobus.c | 14 ++++---------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index c25c41f43042..2f448ea3a956 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -674,16 +674,19 @@ gpiobus_child_location(device_t bus, device_t child, struct sbuf *sb) return (0); } -static device_t -gpiobus_add_child(device_t dev, u_int order, const char *name, int unit) +device_t +gpiobus_add_child_common(device_t dev, u_int order, const char *name, int unit, + size_t ivars_size) { device_t child; struct gpiobus_ivar *devi; + KASSERT(ivars_size >= sizeof(struct gpiobus_ivar), + ("child ivars must include gpiobus_ivar as their first member")); child = device_add_child_ordered(dev, order, name, unit); if (child == NULL) return (child); - devi = malloc(sizeof(struct gpiobus_ivar), M_DEVBUF, M_NOWAIT | M_ZERO); + devi = malloc(ivars_size, M_DEVBUF, M_NOWAIT | M_ZERO); if (devi == NULL) { device_delete_child(dev, child); return (NULL); @@ -694,6 +697,13 @@ gpiobus_add_child(device_t dev, u_int order, const char *name, int unit) return (child); } +static device_t +gpiobus_add_child(device_t dev, u_int order, const char *name, int unit) +{ + return (gpiobus_add_child_common(dev, order, name, unit, + sizeof(struct gpiobus_ivar))); +} + static void gpiobus_child_deleted(device_t dev, device_t child) { diff --git a/sys/dev/gpio/gpiobus_internal.h b/sys/dev/gpio/gpiobus_internal.h index de3f57663132..82f1354d9e75 100644 --- a/sys/dev/gpio/gpiobus_internal.h +++ b/sys/dev/gpio/gpiobus_internal.h @@ -42,6 +42,7 @@ void gpiobus_free_ivars(struct gpiobus_ivar *); int gpiobus_read_ivar(device_t, device_t, int, uintptr_t *); int gpiobus_acquire_pin(device_t, uint32_t); void gpiobus_release_pin(device_t, uint32_t); +device_t gpiobus_add_child_common(device_t, u_int, const char *, int, size_t); extern driver_t gpiobus_driver; #endif diff --git a/sys/dev/gpio/ofw_gpiobus.c b/sys/dev/gpio/ofw_gpiobus.c index fc5fb03d6824..b12b78fac18c 100644 --- a/sys/dev/gpio/ofw_gpiobus.c +++ b/sys/dev/gpio/ofw_gpiobus.c @@ -451,28 +451,22 @@ ofw_gpiobus_add_child(device_t dev, u_int order, const char *name, int unit) device_t child; struct ofw_gpiobus_devinfo *devi; - child = device_add_child_ordered(dev, order, name, unit); + child = gpiobus_add_child_common(dev, order, name, unit, + sizeof(struct ofw_gpiobus_devinfo)); if (child == NULL) - return (child); - devi = malloc(sizeof(struct ofw_gpiobus_devinfo), M_DEVBUF, - M_NOWAIT | M_ZERO); - if (devi == NULL) { - device_delete_child(dev, child); - return (0); - } + return (NULL); /* * NULL all the OFW-related parts of the ivars for non-OFW * children. */ + devi = device_get_ivars(child); devi->opd_obdinfo.obd_node = -1; devi->opd_obdinfo.obd_name = NULL; devi->opd_obdinfo.obd_compat = NULL; devi->opd_obdinfo.obd_type = NULL; devi->opd_obdinfo.obd_model = NULL; - device_set_ivars(child, devi); - return (child); }