From nobody Mon Jan 26 09:33:22 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 4f03Hk2vTqz6Q1K3 for ; Mon, 26 Jan 2026 09:33:22 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f03Hk16DYz3J8D for ; Mon, 26 Jan 2026 09:33:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769420002; 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=NVNFy01B7LXFs0LaU3SVGfhdnIsDh2PXVL4QdHYQSvg=; b=Xf6KiESdFjzGd5MuAUjSWtgIXcnZq6pAOVd9PA57zrM/qDKMG0MAJtVBacw4Big2y0jRF+ 4IWpckUdm/7tIi8d0gAEsw2kngd1L+ceBJ4ERalvs4XAk01lgsbzd9uXa8qTamTOvFK61p 52KezrgUEIK0qQVxEz/yXGh4co0BUjH/+19GGA5dQQw5UP9g7gDAJdTHZqEjNb0ZBGKYcO B821ukLo7/j5lkM5Cqx25U4r20kaIXQyRzGMq7OrUfwg7+ivI/vNm7jt4sq11DEJxc+2fb ec9RNKGj/JHV83H/O1uwA/D93b5+LT5TpBAk8ppxBlhJi0K/6LVUmwVOAEijZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769420002; 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=NVNFy01B7LXFs0LaU3SVGfhdnIsDh2PXVL4QdHYQSvg=; b=Xja9a3CsE7BfNbBNkfUInzxIVqG3bhLj7a5chVmUTih++mWbK5M5y8xZTb6pwlwWf+oVim GC97VO+xluqLUDjRiVrPpxs5PCEKmSctFWrqMsU8EujDreF0mlvsJV76HKjRAIj5z6il2+ aKUeK1DCtgUesiREQTxj3m5yUZiX02pQxp9aIv6cUW0bAmrjJBcMdrSB4y/57e1+jIr8LE l5tMGtsi2g2fybkprhWNw6aIO+T1/YxneMjp3eqJK48BkGrvG4BLGl00Ix/BmNpm6eI2Pa 0oYDGuwFUBAe7LXtXzAraCQo1UtXpW8WaWsYklvTh9SwwKg6y1Jl/41bmuqpbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769420002; a=rsa-sha256; cv=none; b=Wydv/2C2dhA/Irc2D/wwXIwxdxAmSNBiQfUspyR6SQTNOkWCQy0pLaDLEoSXXRBqjvA5ck Ev5NTGnJZmTJKq+eHxFpSEjg/PGs0DXr8Iu+tDJtoor5ezQOimD/baN7VmTQU7MNCJViqh JTEuBrhgixMQA6MRiA4V2W8muWWMxB/V9RBNCc/aXPr97GDcf22Fs2+r4ssf0o8moYq+9+ J32XI3lPFcj23SFqjwHa+oHmdX+TvNt64m0uD90S+No6eN29KshGVjQlRI9vffCKPdgzqX y51GjBtP8S4bfG6EhTwHrcjz2Wz2d4DLG+z+yQ93sFQRfrcPR4Wdxh+De1B/7g== 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 4f03Hk0WPtzxN for ; Mon, 26 Jan 2026 09:33:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34248 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 09:33:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: c29e05113c00 - main - hpt: remove unnecessary macro expansion hacks 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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c29e05113c000dc04552f8d21a92fd00c60d0a98 Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 09:33:22 +0000 Message-Id: <697734e2.34248.27b3a5aa@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=c29e05113c000dc04552f8d21a92fd00c60d0a98 commit c29e05113c000dc04552f8d21a92fd00c60d0a98 Author: Ahmad Khalifa AuthorDate: 2026-01-26 09:28:08 +0000 Commit: Ahmad Khalifa CommitDate: 2026-01-26 09:32:10 +0000 hpt: remove unnecessary macro expansion hacks Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54875 --- sys/dev/hpt27xx/hpt27xx_osm_bsd.c | 10 +++------- sys/dev/hptmv/entry.c | 3 +-- sys/dev/hptnr/hptnr_osm_bsd.c | 10 +++------- sys/dev/hptrr/hptrr_osm_bsd.c | 10 +++------- 4 files changed, 10 insertions(+), 23 deletions(-) diff --git a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c index e086a1554940..638efa9e2ae2 100644 --- a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c +++ b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c @@ -1271,13 +1271,9 @@ static driver_t hpt_pci_driver = { #error "no TARGETNAME found" #endif -/* use this to make TARGETNAME be expanded */ -#define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5) -#define __MODULE_VERSION(p1, p2) MODULE_VERSION(p1, p2) -#define __MODULE_DEPEND(p1, p2, p3, p4, p5) MODULE_DEPEND(p1, p2, p3, p4, p5) -__DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, 0, 0); -__MODULE_VERSION(TARGETNAME, 1); -__MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1); +DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, NULL, NULL); +MODULE_VERSION(TARGETNAME, 1); +MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1); static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td) { diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c index f3d58f285b39..a82ffb66bdc8 100644 --- a/sys/dev/hptmv/entry.c +++ b/sys/dev/hptmv/entry.c @@ -95,8 +95,7 @@ static driver_t hpt_pci_driver = { sizeof(IAL_ADAPTER_T) }; -#define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5) -__DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, 0, 0); +DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, NULL, NULL); MODULE_DEPEND(PROC_DIR_NAME, cam, 1, 1, 1); #define ccb_ccb_ptr spriv_ptr0 diff --git a/sys/dev/hptnr/hptnr_osm_bsd.c b/sys/dev/hptnr/hptnr_osm_bsd.c index 7426873964fb..fa0f78a7e01a 100644 --- a/sys/dev/hptnr/hptnr_osm_bsd.c +++ b/sys/dev/hptnr/hptnr_osm_bsd.c @@ -1561,13 +1561,9 @@ static driver_t hpt_pci_driver = { #error "no TARGETNAME found" #endif -/* use this to make TARGETNAME be expanded */ -#define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5) -#define __MODULE_VERSION(p1, p2) MODULE_VERSION(p1, p2) -#define __MODULE_DEPEND(p1, p2, p3, p4, p5) MODULE_DEPEND(p1, p2, p3, p4, p5) -__DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, 0, 0); -__MODULE_VERSION(TARGETNAME, 1); -__MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1); +DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, NULL, NULL); +MODULE_VERSION(TARGETNAME, 1); +MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1); static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td) { diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c index 78a051d54cf8..f4ae6732ea5d 100644 --- a/sys/dev/hptrr/hptrr_osm_bsd.c +++ b/sys/dev/hptrr/hptrr_osm_bsd.c @@ -1204,13 +1204,9 @@ static driver_t hpt_pci_driver = { #error "no TARGETNAME found" #endif -/* use this to make TARGETNAME be expanded */ -#define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5) -#define __MODULE_VERSION(p1, p2) MODULE_VERSION(p1, p2) -#define __MODULE_DEPEND(p1, p2, p3, p4, p5) MODULE_DEPEND(p1, p2, p3, p4, p5) -__DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, 0, 0); -__MODULE_VERSION(TARGETNAME, 1); -__MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1); +DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, NULL, NULL); +MODULE_VERSION(TARGETNAME, 1); +MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1); static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td) {