From nobody Thu Nov 24 23:17:38 2022 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 4NJDRl235Gz4jPLJ; Thu, 24 Nov 2022 23:17:39 +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 4NJDRl1LZsz49mV; Thu, 24 Nov 2022 23:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669331859; 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=EnLwdC0cYLiovagWNwuYkmW/gzXZEcriZtGV8nbQwc4=; b=gmvUtnh9jl/FCAmYBh9oRFKhSpZ5Y/S/gu8QLEi6JUcu0rjn0dE9cTL4yT61umqlCQb5Ll Tv0VD0V4Qppj7YkbgDOsiJXX5WruRIk3FTD39upq0SsxTLgXwGIQVZafKkbhB4CR2QoKcQ D7nzm2fRK+HymEIG8apvMv+hBGm/k4moHIEk6qWxwwvKr7WlyF2GMhqYPSnn2BH0u1WaKi 4MtGjPe9RvpGYDSW0qURh3cyCUuXGUGy+K0RhhL19tPTCIFjFrRa2iFCZVd1Qzji2gFIDJ hgfpNc8vQSq9nFEajeW/+eTixvNHucd7+JSb25EdrhOE0jXdwaylbJCgJ17erg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669331859; 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=EnLwdC0cYLiovagWNwuYkmW/gzXZEcriZtGV8nbQwc4=; b=VP59DOKEYExeg0KZ8r4he/tSCW+L5OJH1z9d5miTvIZzT88I1a1ZFeOBM36xBbJwog4muc HZaNomuHoiLVNZ8rSNrO0beznqgH1TPaQhN9mqS+sQOJakJ6bZYOxF1oTVaSh1ILYd/MVm X9GdYY8odLPeeApwSEvYJQSTpYF+jKAbhcdchM+FfPCK92iLOob/0Y4sTA7rpvvG3/pNDd G5TrAX4ZlHKVvUa7yQGDOmD4ynSNPR1jmNepbRBGq5lYz3ch/fmBL0Tz7pozpGgo7VVAQS A3hMnSviVDKNMOreB8kk4gek5ACRhFEokdPHQaOAr5axIDYCbFDstmyK1CHDaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669331859; a=rsa-sha256; cv=none; b=PVxJQSo3c5IFNP2BkIQUID/MMKPL51fih3FVi5IMcIBvpmn7Flz5KQ2dL5B0wwfveWzZZZ xKCLzd3MuoryDF8gXmy0fOZgLdvSoGysXBoH0gt3r/GrGQ/rCrn6MoGDSWTRuE16W1XqYy r8/GEMFCDyvugwlkl6V+ox/dVY1bd7l/wfe0vPn9+WhtjbjFJymERm6qJRhqjfV8gxKzi8 zBtJUYd3MNm3BJhLd/2h95CqDgjPmhitdNquOh2RfLTSOujKCSqpa375PrKlEML2+U8NqN ykyU9s2gb9lJsG9mnUworaE2DCQ36MMY2h+m0eJK+AAjELp/A6NMtjXAmYi/iQ== 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 4NJDRl0Rf7zK9c; Thu, 24 Nov 2022 23:17:39 +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 2AONHcOl007021; Thu, 24 Nov 2022 23:17:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AONHclU007020; Thu, 24 Nov 2022 23:17:38 GMT (envelope-from git) Date: Thu, 24 Nov 2022 23:17:38 GMT Message-Id: <202211242317.2AONHclU007020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 7048e1da51c9 - stable/12 - ng_ubt: Use DEFINE_CLASS_1 macro for kobj inheritance. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 7048e1da51c9aa712de50831c989df87fcae8bb7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=7048e1da51c9aa712de50831c989df87fcae8bb7 commit 7048e1da51c9aa712de50831c989df87fcae8bb7 Author: Vladimir Kondratyev AuthorDate: 2021-04-15 14:25:50 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-11-24 23:13:28 +0000 ng_ubt: Use DEFINE_CLASS_1 macro for kobj inheritance. MFC after: 2 weeks (cherry picked from commit d605d72948431d352455fc22b79a32a56ce00aaf) --- 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);