From owner-dev-commits-src-all@freebsd.org Thu Apr 15 14:29:31 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 954795F25D2; Thu, 15 Apr 2021 14:29:31 +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 4FLhYl3WxFz4S0m; Thu, 15 Apr 2021 14:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 68C4113114; Thu, 15 Apr 2021 14:29:31 +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 13FETVI1044402; Thu, 15 Apr 2021 14:29:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13FETVMA044401; Thu, 15 Apr 2021 14:29:31 GMT (envelope-from git) Date: Thu, 15 Apr 2021 14:29:31 GMT Message-Id: <202104151429.13FETVMA044401@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: d605d7294843 - main - ng_ubt: Use DEFINE_CLASS_1 macro for kobj inheritance. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d605d72948431d352455fc22b79a32a56ce00aaf Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Apr 2021 14:29:31 -0000 The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=d605d72948431d352455fc22b79a32a56ce00aaf commit d605d72948431d352455fc22b79a32a56ce00aaf Author: Vladimir Kondratyev AuthorDate: 2021-04-15 14:25:50 +0000 Commit: Vladimir Kondratyev CommitDate: 2021-04-15 14:25:50 +0000 ng_ubt: Use DEFINE_CLASS_1 macro for kobj inheritance. MFC after: 2 weeks --- sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c index c56d2288e77b..377543b73387 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c @@ -145,15 +145,8 @@ static device_method_t ubt_intel_methods[] = DEVMETHOD_END }; -static kobj_class_t ubt_baseclasses[] = { &ubt_driver, NULL }; -static driver_t ubt_intel_driver = -{ - .name = "ubt", - .methods = ubt_intel_methods, - .size = sizeof(struct ubt_softc), - .baseclasses = ubt_baseclasses, -}; - +DEFINE_CLASS_1(ubt, ubt_intel_driver, ubt_intel_methods, + sizeof(struct ubt_softc), ubt_driver); DRIVER_MODULE(ng_ubt_intel, uhub, ubt_intel_driver, ubt_devclass, 0, 0); MODULE_VERSION(ng_ubt_intel, NG_BLUETOOTH_VERSION); MODULE_DEPEND(ng_ubt_intel, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION);