git: 7048e1da51c9 - stable/12 - ng_ubt: Use DEFINE_CLASS_1 macro for kobj inheritance.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 24 Nov 2022 23:17:38 UTC
The branch stable/12 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=7048e1da51c9aa712de50831c989df87fcae8bb7 commit 7048e1da51c9aa712de50831c989df87fcae8bb7 Author: Vladimir Kondratyev <wulf@FreeBSD.org> AuthorDate: 2021-04-15 14:25:50 +0000 Commit: Vladimir Kondratyev <wulf@FreeBSD.org> 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);