From nobody Tue Aug 23 16:38:39 2022 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 4MBw0J23sZz4b2fx; Tue, 23 Aug 2022 16:38:40 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MBw0J1WDQz3Dbc; Tue, 23 Aug 2022 16:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661272720; 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=hSWOlRcgHC8ThR2y9Tb8KSPV7DZKs6jZzWJS+6J07rU=; b=yizx5URUhezukJusBWGxRD2AkYGaGQV8f1+6OF1uxl4LFdWjzaa5xFbbuTcyk+VexrI3FS NHjdll2nuAa60yAXiHc8/VHMB67yXceII2kz6ntyTB3d7VSvzvcy1zJ5F+Rskj57Qnue47 iBln3ij7mOPUHQuvrOjVUQiSRUnTjT3xWMBH4sB9VmSszrOmCrRDOiiWyZ+X6AQACGknis u0eS9zNy3XCfyl1hLmMUqm4LG+/kLbit6XWZs9UZE+/VPwZqGxD8MKVqDX/vPV2wP+H2CF mS4KzEjAbbHjVzzhI8Jieh+oZ6VpTYCPVdsQvnB4sxwVBFVBXP6CK1SOgHHPhA== 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 4MBw0J0dGGzcJ2; Tue, 23 Aug 2022 16:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27NGcdDG097305; Tue, 23 Aug 2022 16:38:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27NGcdZs097304; Tue, 23 Aug 2022 16:38:39 GMT (envelope-from git) Date: Tue, 23 Aug 2022 16:38:39 GMT Message-Id: <202208231638.27NGcdZs097304@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: 9e4e7bcaef3f - main - *DRIVER_MODULE*: Remove the compat shims to accept the devclass argument. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 9e4e7bcaef3fcaab66cdecd08b1664ac92cc9a6b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661272720; 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=hSWOlRcgHC8ThR2y9Tb8KSPV7DZKs6jZzWJS+6J07rU=; b=TXPAbiwyA5EzEyOf34WCESJY26VWXY2yyMJZqMxyzzhHAVIl2whb31Vw/Ezil+uxFPfOv0 1bAUuN7+Td1ksIGYOFWmTSeH/Q+SWqQOmJZ5FLuPW3i7/4ohTUFDJioEB3aEa9ED1F1zHY KryZefh2aqAFU6AB17yqKJjHACAmrskQk7YRwSPzleuSMchZUGd+8nu5i1HGWej8cBBu3a LDvZ/7fn70GWaETEjDd+2QacHJErnDrBXRuv2hs5rxKLTc4NXm7Tc+nFtDnEFSUy2IUEEy uOPD9HhSdOnUypAVcTDSb3wRCM8n8W5O0AKhRd9llNDwRJd9iryRLO+KV9eq3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661272720; a=rsa-sha256; cv=none; b=QNATFreU4tVfhjawLoYLllyxI6Hg3lLjAGFCcC7mOorwKzUNhmW6MrD28Gzmh9MNF5+TmA gAdwzUk8uA3v+YiHjug2j6GSKfjDD40Ahw7ReqTnYR2HNayLN33CvS7Zi1Fsz+HY/r4gnm Y0L0Y5t18GX7Nmc0c8qjS/aoEdhDRP9VOGfeVvUVNIzntv8nHteWo11G/T2KPmqbWqX6ER HKVM1OvMJNeK2OB/90+b4TYVQ6JGb9an0kVyNaYrj6UmamSJctS+UsyXEeODeyCchqO3jb j05miEYjBYmPI9HRMTCg7zGuiwwJk194z5HJauatZ5sRtIRJpIuhjln0t/XkXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9e4e7bcaef3fcaab66cdecd08b1664ac92cc9a6b commit 9e4e7bcaef3fcaab66cdecd08b1664ac92cc9a6b Author: John Baldwin AuthorDate: 2022-08-23 16:36:41 +0000 Commit: John Baldwin CommitDate: 2022-08-23 16:38:09 +0000 *DRIVER_MODULE*: Remove the compat shims to accept the devclass argument. PR: 264969 (exp-run) Differential Revision: https://reviews.freebsd.org/D35168 --- sys/sys/bus.h | 62 ++++++++++------------------------------------------------- 1 file changed, 10 insertions(+), 52 deletions(-) diff --git a/sys/sys/bus.h b/sys/sys/bus.h index a1d11138a1cc..c363d1ec550e 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -800,17 +800,14 @@ struct driver_module_data { int dmd_pass; }; -#define _DRIVER_MODULE_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, NAME, ...) \ - NAME - -#define _EARLY_DRIVER_MODULE_ORDERED(name, busname, driver, devclass, \ - evh, arg, order, pass) \ - \ +#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, \ - devclass, \ + NULL, \ pass \ }; \ \ @@ -822,57 +819,18 @@ static moduledata_t name##_##busname##_mod = { \ DECLARE_MODULE(name##_##busname, name##_##busname##_mod, \ SI_SUB_DRIVERS, order) -#define EARLY_DRIVER_MODULE_ORDERED7(name, busname, driver, evh, arg, \ - order, pass) \ - _EARLY_DRIVER_MODULE_ORDERED(name, busname, driver, NULL, evh, \ - arg, order, pass) - -#define EARLY_DRIVER_MODULE_ORDERED8(name, busname, driver, devclass, \ - evh, arg, order, pass) \ - _EARLY_DRIVER_MODULE_ORDERED(name, busname, driver, &devclass, \ - evh, arg, order, pass) - -#define EARLY_DRIVER_MODULE_ORDERED(...) \ - _DRIVER_MODULE_MACRO(__VA_ARGS__, EARLY_DRIVER_MODULE_ORDERED8, \ - EARLY_DRIVER_MODULE_ORDERED7)(__VA_ARGS__) - -#define EARLY_DRIVER_MODULE7(name, busname, driver, devclass, evh, arg, pass) \ - EARLY_DRIVER_MODULE_ORDERED8(name, busname, driver, devclass, \ - evh, arg, SI_ORDER_MIDDLE, pass) - -#define EARLY_DRIVER_MODULE6(name, busname, driver, evh, arg, pass) \ - EARLY_DRIVER_MODULE_ORDERED7(name, busname, driver, evh, arg, \ +#define EARLY_DRIVER_MODULE(name, busname, driver, evh, arg, pass) \ + EARLY_DRIVER_MODULE_ORDERED(name, busname, driver, evh, arg, \ SI_ORDER_MIDDLE, pass) -#define EARLY_DRIVER_MODULE(...) \ - _DRIVER_MODULE_MACRO(__VA_ARGS__, INVALID, \ - EARLY_DRIVER_MODULE7, EARLY_DRIVER_MODULE6)(__VA_ARGS__) - -#define DRIVER_MODULE_ORDERED7(name, busname, driver, devclass, evh, arg,\ - order) \ - EARLY_DRIVER_MODULE_ORDERED8(name, busname, driver, devclass, \ - evh, arg, order, BUS_PASS_DEFAULT) - -#define DRIVER_MODULE_ORDERED6(name, busname, driver, evh, arg, order) \ - EARLY_DRIVER_MODULE_ORDERED7(name, busname, driver, evh, arg, \ +#define DRIVER_MODULE_ORDERED(name, busname, driver, evh, arg, order) \ + EARLY_DRIVER_MODULE_ORDERED(name, busname, driver, evh, arg, \ order, BUS_PASS_DEFAULT) -#define DRIVER_MODULE_ORDERED(...) \ - _DRIVER_MODULE_MACRO(__VA_ARGS__, INVALID, \ - DRIVER_MODULE_ORDERED7, DRIVER_MODULE_ORDERED6)(__VA_ARGS__) - -#define DRIVER_MODULE6(name, busname, driver, devclass, evh, arg) \ - EARLY_DRIVER_MODULE7(name, busname, driver, devclass, evh, arg, \ +#define DRIVER_MODULE(name, busname, driver, evh, arg) \ + EARLY_DRIVER_MODULE(name, busname, driver, evh, arg, \ BUS_PASS_DEFAULT) -#define DRIVER_MODULE5(name, busname, driver, evh, arg) \ - EARLY_DRIVER_MODULE6(name, busname, driver, evh, arg, \ - BUS_PASS_DEFAULT) - -#define DRIVER_MODULE(...) \ - _DRIVER_MODULE_MACRO(__VA_ARGS__, INVALID, INVALID, \ - DRIVER_MODULE6, DRIVER_MODULE5)(__VA_ARGS__) - /** * Generic ivar accessor generation macros for bus drivers */