From nobody Thu Jan 23 20:31:07 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 4YfCJX2lPyz5lRb5; Thu, 23 Jan 2025 20:31:08 +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 4YfCJW6km3z3Lnl; Thu, 23 Jan 2025 20:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737664268; 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=IzmwQMYmthe4wef2Y1LnoXlClutdTnwBu+T7GXly1iM=; b=Dfu3JUACLn+5sjS0KhsoaKv745XXL7/W1a2KhrZAjY9b8PcR/8m2X8Q/y1S6XNpy1l5XOg XZ8fH/jBtS6LR8Y4K8wDLKv0Hw1+Ss8RD+HFKBGUb45ZFvmMp7YrRt9v7z6qAEcefFK5Zk 64MMUzaf2GvX0TyJ/E3rs5XvTJg9d+rfHlgwLrUNsAmu6KPVTOt1h3OmDJmYD3lLjhf51/ NiKpBAEjS0Q/8pDNwS/V4SZ5I1JW1qi40sUO4K6SHmp3bRvopJ6zwSjmVgqyj1ht7vsTl3 cZM6bYR94ItFBX8Anaqrx2lv5yJcmf/zO28p0x3YKFf3ugsFtQWj287IJoiPIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737664268; 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=IzmwQMYmthe4wef2Y1LnoXlClutdTnwBu+T7GXly1iM=; b=riRdoFw9KSfCnkfBYFNHIWQHQRCAD9Xp9gqt7Gi++3AcF7ETtxYOt8YHHqc+N14gOTQaUW KBYrTH8KGzzvcVxPOc/lpgpd6tbNJiDE9EqBhjF2LHwEu3zGcAQoakqohrslln6AOuTJ9E bbr9L4aQRtOaf7wz2ud9M82hQc3f7t6gYxgT5lvRec1X/+DoxhC7B1Vmgh9xJTpZrXGCs+ 5T110aurjjYBKgiXjBkLlINBvgRy09it4hxXK3g5l4XWpRcwZ7Wyqx6q0LtBXKDB3iqbli hhThlVq84f/2KArA/Kzwp5sdY/F3t3shZjq9cKLMjf5oWNSoQ7a5RJ8CY8KPyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737664268; a=rsa-sha256; cv=none; b=H2ldygKbUChIykCHlFo4HiE36BL+fLWA6gGDSQ4XZZEaMNWExQ1IrhjBU4xysa9iQN/sKc VF2vgQXH4aU9CQ7IBj3DROdiDLpyrmjhvmCHhrUZoAmm1CIyqGjVJ128zgSmPCP1g/7uQg VFFo4gBDThSI7YF1hz1I9NZOq1rzQg9tNpgnYPA5iauHFlKOOVuQvoj1NrXna5R+ucqUsm RwD6e9xnJVcshP2tGzoen2VyFu50rYTwN40rFUB8vucMUcH4Nvs5mLJ97ivoEW47izBUB6 9e7kvrP9iL5chyT7FslIpo2M0I51tirIAdp9w/A7CTGLcxDl0vUZONxRPutjWg== 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 4YfCJW6Km9zvHG; Thu, 23 Jan 2025 20:31:07 +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 50NKV7wu074392; Thu, 23 Jan 2025 20:31:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NKV7kl074389; Thu, 23 Jan 2025 20:31:07 GMT (envelope-from git) Date: Thu, 23 Jan 2025 20:31:07 GMT Message-Id: <202501232031.50NKV7kl074389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: db221468b09a - main - EARLY_DRIVER_MODULE: use designated initializers 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db221468b09ac8b57fa6ec8c142fdde8d5d4beeb Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=db221468b09ac8b57fa6ec8c142fdde8d5d4beeb commit db221468b09ac8b57fa6ec8c142fdde8d5d4beeb Author: Mitchell Horne AuthorDate: 2025-01-23 20:29:27 +0000 Commit: Mitchell Horne CommitDate: 2025-01-23 20:30:31 +0000 EARLY_DRIVER_MODULE: use designated initializers It helps the reader to parse the macro definition, with respect to how the arguments are mapped to the structure members. No functional change intended. Reviewed by: imp, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48489 --- sys/sys/bus.h | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/sys/sys/bus.h b/sys/sys/bus.h index 067868da4367..8b32e10f1285 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -851,24 +851,25 @@ struct driver_module_data { int dmd_pass; }; -#define EARLY_DRIVER_MODULE_ORDERED(name, busname, driver, evh, arg, \ +#define EARLY_DRIVER_MODULE_ORDERED(_name, busname, driver, evh, arg, \ order, pass) \ \ -static struct driver_module_data name##_##busname##_driver_mod = { \ - evh, arg, \ - #busname, \ - (kobj_class_t) &driver, \ - NULL, \ - pass \ +static struct driver_module_data _name##_##busname##_driver_mod = { \ + .dmd_chainevh = evh, \ + .dmd_chainarg = arg, \ + .dmd_busname = #busname, \ + .dmd_driver = (kobj_class_t)&driver, \ + .dmd_devclass = NULL, \ + .dmd_pass = pass, \ }; \ \ -static moduledata_t name##_##busname##_mod = { \ - #busname "/" #name, \ - driver_module_handler, \ - &name##_##busname##_driver_mod \ +static moduledata_t _name##_##busname##_mod = { \ + .name = #busname "/" #_name , \ + .evhand = driver_module_handler, \ + .priv = &_name##_##busname##_driver_mod, \ }; \ -DECLARE_MODULE(name##_##busname, name##_##busname##_mod, \ - SI_SUB_DRIVERS, order) +DECLARE_MODULE(_name##_##busname, _name##_##busname##_mod, \ + SI_SUB_DRIVERS, order) #define EARLY_DRIVER_MODULE(name, busname, driver, evh, arg, pass) \ EARLY_DRIVER_MODULE_ORDERED(name, busname, driver, evh, arg, \