From nobody Sat Jan 11 04:03:49 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 4YVPys2ksCz5l9m8; Sat, 11 Jan 2025 04:03:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YVPys1gqtz4VBp; Sat, 11 Jan 2025 04:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736568229; 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=7K9uLepdKvU6OpzAV0MiIT27Vfn8LixHBlA/+sTPww8=; b=gdmwPdJ5w2LKEPYV7M6NP9E851YhxHFvk/MO69v+QE4YTu+U1yuy+FvWvdVfv+AMoZVOC3 j4tX9xcnCBN8lxqqg9C9fGiht1hoM5hOMnzunU5cug+aQMzQDi2+WIDcxg3PTg7e4fBKFu rP3tvZj82bIGDH+Zz7xO2je3OziOuGYgIpU8tNtnLjwco6+dUwMvU+38DlS/AvSW1qYWSm Ms5UOPaZwkr4fAsu1sFWKYZRuRHJTl8oZEJonqvSR2VSwIZVXEFY1jL5XVK2kodoFzqCIq 8/5g5YaGFLtqxkbDwJ9Tx9oYYL+TzldU1VYcC6oM12feC+cH/0fNE1zqlE52bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736568229; 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=7K9uLepdKvU6OpzAV0MiIT27Vfn8LixHBlA/+sTPww8=; b=Gkdaf6sZrjAWYRuojCkoJJLtGSTCoJ7TGagTHyJUdhLk7ZhyH+u/x1nl2V1gWA2er+mmgZ HL69gGucTfq7wfXwMwypEj4W+4Wq4dWeVjV047oKdyt52/DTY3dwIBgYOEQNtUfMsuXKqo anUjXoBJNN3Vr5Q/AI6XL8k8W+wJkF/ZwX2rVJOwCMZUMSV246SYoUXrNQpzcJFNP3Czpw RADHno0yUY/w+VtPRizf56On4LLlh/mB3QFgPLkBYjUhLQJ5dQ+b2+haFsyy3KmaF4FPiG aUjKRK0S2hqtX+EKQOWPkJAwcIkcjv52cnyIvLBfjGWkVrwTgLe3me/dGnLyZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736568229; a=rsa-sha256; cv=none; b=BK4we4et0OhoMbBUUSpWZTJZIOHuOelIpe0/OWp1EkOf0WuLFB1eWRTRIfdHoP4hn/lKM4 HKJHH5v5VFQTmLuBIYJJ4GsJteQRUYhvWb3h625WuVGVWcfajsxXV4Rkzn2+Bk4/brEO6q BbDZeojvi7sjolTa92XLkARKopAAG6yvYA0vsqXLkBAL3eiBKMnzJK8gBVxh4vNS0r1IPZ Hocnr3PkO71YuYXhAJgQ/aOtgWUQtCLL3UWT+AtSt+btCibOODugNI2pxaZEKjiaPp5K8x GDJZgpm7dCUTt+6A6JQljRVOzQG2V2L+gytGew6mX6lKDhqj9ZCTKmVjULvoqQ== 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 4YVPys1F9LzjVH; Sat, 11 Jan 2025 04:03:49 +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 50B43noC017667; Sat, 11 Jan 2025 04:03:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50B43nc0017664; Sat, 11 Jan 2025 04:03:49 GMT (envelope-from git) Date: Sat, 11 Jan 2025 04:03:49 GMT Message-Id: <202501110403.50B43nc0017664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4378bd382ea0 - main - stand/kshim: Replace bus_generic_attach with bus_attach_children 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4378bd382ea0f5707099273b1fa2393979a22628 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4378bd382ea0f5707099273b1fa2393979a22628 commit 4378bd382ea0f5707099273b1fa2393979a22628 Author: John Baldwin AuthorDate: 2025-01-11 04:01:21 +0000 Commit: John Baldwin CommitDate: 2025-01-11 04:03:28 +0000 stand/kshim: Replace bus_generic_attach with bus_attach_children Fixes: 18250ec6c089 Replace calls to bus_generic_attach with bus_attach_children Differential Revision: https://reviews.freebsd.org/D48404 --- stand/kshim/bsd_kernel.c | 6 ++---- stand/kshim/bsd_kernel.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/stand/kshim/bsd_kernel.c b/stand/kshim/bsd_kernel.c index ac552d86603f..fb1b4239fd03 100644 --- a/stand/kshim/bsd_kernel.c +++ b/stand/kshim/bsd_kernel.c @@ -205,16 +205,14 @@ bus_release_resource(device_t dev, int type, int rid, struct resource *r) return (EINVAL); } -int -bus_generic_attach(device_t dev) +void +bus_attach_children(device_t dev) { device_t child; TAILQ_FOREACH(child, &dev->dev_children, dev_link) { device_probe_and_attach(child); } - - return (0); } bus_space_tag_t diff --git a/stand/kshim/bsd_kernel.h b/stand/kshim/bsd_kernel.h index 0608d32f21ec..0b5d659951a2 100644 --- a/stand/kshim/bsd_kernel.h +++ b/stand/kshim/bsd_kernel.h @@ -646,7 +646,7 @@ int bus_release_resource(device_t, int, int, struct resource *); void bus_release_resources(device_t, const struct resource_spec *, struct resource **); struct resource *bus_alloc_resource_any(device_t, int, int *, unsigned int); -int bus_generic_attach(device_t); +void bus_attach_children(device_t); bus_space_tag_t rman_get_bustag(struct resource *); bus_space_handle_t rman_get_bushandle(struct resource *); u_long rman_get_size(struct resource *);