From nobody Tue Jun 23 16:28:06 2026 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 4gl9Ty56JLz6hhYK for ; Tue, 23 Jun 2026 16:28:06 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9Ty2Wdrz3McX for ; Tue, 23 Jun 2026 16:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UevL4TG4Zx01GbxWo5BKLPHPjL5qgNd/cwOWcZOx2lc=; b=ynrYGT9U+eydSHmNyQcboeYReqW6yWXh8AbSw/Czbm5siArI3DA09VP8DZHuNTealLGL9C jSlz/0SJ6f+g7g2z/jMftYb61bn2wr7R7C+WPtyE7JhYW6kbVdnU7i0+xP72xmruU1IVsE F98vBi3YG66Qe0QQp7JHUu9SwnG9FYiNkI5YURcD10vyZJtjbOBVSZI22vq4PKSvg/x3B/ yLbE2+B6zdJzQzI5bwwUNxNt5UIGNry2Dz6ngH4O45hGFeNmrZ2oUwL/E6y4n7SVeLCQGM tqGXKmNzNcDv1KC6X1a2AFiJarbEBtpMvsZLqcZN9/I/KVrYfRuYGyrUE4qn4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232086; a=rsa-sha256; cv=none; b=YtfcZBAAoLa9BBwZ5o15rDZmmInnE+wyiclUsbY633CwO/Zyj6eM+1q4zkhNmjU9ttbTzQ DQZk9vJry0bABw8d6nv+7wWc42McM2sa2bOuGhctGbSPuC4NCelacDxmbW88QglS2SbqEc G1baeINxlnwblWvK0qHhVvXMXc85jqxL7REIQdwSLD6eVARZeH+OGvcWtZv4EebHk8nGGn pWKWBxYFMcGscukGUb/FF66ubWURtEFoR4lExbXp8B4g5L+47QWqkE7Lef9IHf6yB9hGeD pm8Ljxt5BKvhZqt+8WVZHh4jk+SQipBRNvxVYbvAUQAj+ge/l75PTOuegBBmVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UevL4TG4Zx01GbxWo5BKLPHPjL5qgNd/cwOWcZOx2lc=; b=Q3Q1ydg6/gOLgrVIbVlaS7vAEXCeibsc8CaN+KN7Ary45r4AU/eWvlsJay5KdpjTOqYE3P dREykitw0KUOsiPWJ2E+RR/+D7mLHwX0tlxR2/l/wNzjYfZmpHyNQuLmSmxIKxGx436n18 uu3XmaZo8Re+TMCMlM3amdDAkhMpzIcH/BtkPfjj4ck1/FMO9pnw9nx6lvEV5F+RkOFHk8 13Q8avmgQtC47vKCCuieO7778cjNzb7Vsoxtce34eTsuMgzp0fFfAVDKIpC9popYjup8ML JYF/aSUkRwuH9/fM350W8UGogtK+HyesXm6mLYvZx+RPHAxsigDh+c9+w8T4Vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9Ty0BTmzhHp for ; Tue, 23 Jun 2026 16:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27001 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Zhenlei Huang From: John Baldwin Subject: git: e813c1172631 - stable/15 - sys/bus.h: Some style(9) fixes 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: e813c11726317d815a236e5798150b05eca6701a Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:06 +0000 Message-Id: <6a3ab416.27001.32bddc7b@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e813c11726317d815a236e5798150b05eca6701a commit e813c11726317d815a236e5798150b05eca6701a Author: Zhenlei Huang AuthorDate: 2025-09-12 04:55:14 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:00:51 +0000 sys/bus.h: Some style(9) fixes and whitespace cleanup. MFC after: 3 days (cherry picked from commit 22238759c57d942865cf9d1a355a0d04819eb621) --- sys/sys/bus.h | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/sys/sys/bus.h b/sys/sys/bus.h index b5c9fc09e3b5..801fd0a1fe51 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -78,7 +78,7 @@ typedef enum device_property_type { * The strings are placed one after the other, separated by NUL characters. * Fields should be added after the last one and order maintained for compatibility */ -#define BUS_USER_BUFFER (3*1024) +#define BUS_USER_BUFFER (3 * 1024) struct u_device { uintptr_t dv_handle; uintptr_t dv_parent; @@ -247,8 +247,8 @@ typedef struct devclass *devclass_t; * and may use regular mutexes. However, it is prohibited from * sleeping on a sleep queue. */ -typedef int driver_filter_t(void*); -typedef void driver_intr_t(void*); +typedef int driver_filter_t(void *); +typedef void driver_intr_t(void *); /** * @brief Interrupt type bits. @@ -492,18 +492,18 @@ int bus_generic_resume(device_t dev); int bus_generic_resume_child(device_t dev, device_t child); int bus_generic_setup_intr(device_t dev, device_t child, struct resource *irq, int flags, - driver_filter_t *filter, driver_intr_t *intr, + driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep); struct resource * - bus_generic_rl_alloc_resource (device_t, device_t, int, int *, - rman_res_t, rman_res_t, rman_res_t, u_int); -void bus_generic_rl_delete_resource (device_t, device_t, int, int); -int bus_generic_rl_get_resource (device_t, device_t, int, int, rman_res_t *, - rman_res_t *); -int bus_generic_rl_set_resource (device_t, device_t, int, int, rman_res_t, - rman_res_t); -int bus_generic_rl_release_resource (device_t, device_t, struct resource *); + bus_generic_rl_alloc_resource(device_t, device_t, int, int *, + rman_res_t, rman_res_t, rman_res_t, u_int); +void bus_generic_rl_delete_resource(device_t, device_t, int, int); +int bus_generic_rl_get_resource(device_t, device_t, int, int, rman_res_t *, + rman_res_t *); +int bus_generic_rl_set_resource(device_t, device_t, int, int, rman_res_t, + rman_res_t); +int bus_generic_rl_release_resource(device_t, device_t, struct resource *); struct resource * bus_generic_rman_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, @@ -578,7 +578,7 @@ int bus_get_domain(device_t dev, int *domain); int bus_release_resource(device_t dev, struct resource *r); int bus_free_resource(device_t dev, int type, struct resource *r); int bus_setup_intr(device_t dev, struct resource *r, int flags, - driver_filter_t filter, driver_intr_t handler, + driver_filter_t filter, driver_intr_t handler, void *arg, void **cookiep); int bus_teardown_intr(device_t dev, struct resource *r, void *cookie); int bus_suspend_intr(device_t dev, struct resource *r); @@ -746,9 +746,9 @@ int device_probe_child(device_t bus, device_t dev); int device_quiesce(device_t dev); void device_quiet(device_t dev); void device_quiet_children(device_t dev); -void device_set_desc(device_t dev, const char* desc); -void device_set_descf(device_t dev, const char* fmt, ...) __printflike(2, 3); -void device_set_desc_copy(device_t dev, const char* desc); +void device_set_desc(device_t dev, const char *desc); +void device_set_descf(device_t dev, const char *fmt, ...) __printflike(2, 3); +void device_set_desc_copy(device_t dev, const char *desc); int device_set_devclass(device_t dev, const char *classname); int device_set_devclass_fixed(device_t dev, const char *classname); bool device_is_devclass_fixed(device_t dev); @@ -946,7 +946,8 @@ DECLARE_MODULE(_name##_##busname, _name##_##busname##_mod, \ */ #define __BUS_ACCESSOR(varp, var, ivarp, ivar, type) \ \ -static __inline type varp ## _get_ ## var(device_t dev) \ +static __inline type \ +varp ## _get_ ## var(device_t dev) \ { \ uintptr_t v = 0; \ int e __diagused; \ @@ -958,7 +959,8 @@ static __inline type varp ## _get_ ## var(device_t dev) \ return ((type) v); \ } \ \ -static __inline void varp ## _set_ ## var(device_t dev, type t) \ +static __inline void \ +varp ## _set_ ## var(device_t dev, type t) \ { \ uintptr_t v = (uintptr_t) t; \ int e __diagused; \