git: 6b38db44f0ea - main - sys/kobj.h: Convert macro DEFINE_CLASS to designated initializers

From: Zhenlei Huang <zlei_at_FreeBSD.org>
Date: Sat, 07 Nov 2026 14:36:18 UTC
The branch main has been updated by zlei:

URL: https://cgit.FreeBSD.org/src/commit/?id=6b38db44f0ea36e8336758a460615e9c52def28c

commit 6b38db44f0ea36e8336758a460615e9c52def28c
Author:     Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2026-11-07 14:34:38 +0000
Commit:     Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2026-11-07 14:34:38 +0000

    sys/kobj.h: Convert macro DEFINE_CLASS to designated initializers
    
    So that it is less error prone when adding new struct members or
    refactoring in future.
    
    No functional change intended.
    
    Reviewed by:    kib, imp
    MFC after:      2 weeks
    Differential Revision:  https://reviews.freebsd.org/D61276
---
 sys/sys/kobj.h | 64 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/sys/sys/kobj.h b/sys/sys/kobj.h
index bcf3315d8fe0..317ae3c7ad6e 100644
--- a/sys/sys/kobj.h
+++ b/sys/sys/kobj.h
@@ -128,10 +128,12 @@ DEFINE_CLASS_0(name, name ## _class, methods, size)
  *
  * DEFINE_CLASS_0(foo, foo_class, foo_methods, sizeof(foo_softc));
  */
-#define DEFINE_CLASS_0(name, classvar, methods, size)	\
-							\
-struct kobj_class classvar = {				\
-	#name, methods, size, NULL			\
+#define DEFINE_CLASS_0(_name, classvar, _methods, _size)	\
+								\
+struct kobj_class classvar = {					\
+	.name = #_name,						\
+	.methods = _methods,					\
+	.size = _size,						\
 }
 
 /*
@@ -140,13 +142,16 @@ struct kobj_class classvar = {				\
  * DEFINE_CLASS_1(foo, foo_class, foo_methods, sizeof(foo_softc),
  *			  bar);
  */
-#define DEFINE_CLASS_1(name, classvar, methods, size,	\
-		       base1)				\
-							\
-static kobj_class_t name ## _baseclasses[] =		\
-	{ &base1, NULL };				\
-struct kobj_class classvar = {				\
-	#name, methods, size, name ## _baseclasses	\
+#define DEFINE_CLASS_1(_name, classvar, _methods, _size,	\
+		       base1)					\
+								\
+static kobj_class_t _name ## _baseclasses[] =			\
+	{ &base1, NULL };					\
+struct kobj_class classvar = {					\
+	.name = #_name,						\
+	.methods = _methods,					\
+	.size = _size,						\
+	.baseclasses = _name ## _baseclasses,			\
 }
 
 /*
@@ -155,14 +160,16 @@ struct kobj_class classvar = {				\
  * DEFINE_CLASS_2(foo, foo_class, foo_methods, sizeof(foo_softc),
  *			  bar, baz);
  */
-#define DEFINE_CLASS_2(name, classvar, methods, size,	\
-	               base1, base2)			\
-							\
-static kobj_class_t name ## _baseclasses[] =		\
-	{ &base1,					\
-	  &base2, NULL };				\
-struct kobj_class classvar = {				\
-	#name, methods, size, name ## _baseclasses	\
+#define DEFINE_CLASS_2(_name, classvar, _methods, _size,	\
+	               base1, base2)				\
+								\
+static kobj_class_t _name ## _baseclasses[] =			\
+	{ &base1, &base2, NULL };				\
+struct kobj_class classvar = {					\
+	.name = #_name,						\
+	.methods = _methods,					\
+	.size = _size,						\
+	.baseclasses = _name ## _baseclasses,			\
 }
 
 /*
@@ -171,15 +178,16 @@ struct kobj_class classvar = {				\
  * DEFINE_CLASS_3(foo, foo_class, foo_methods, sizeof(foo_softc),
  *			  bar, baz, foobar);
  */
-#define DEFINE_CLASS_3(name, classvar, methods, size,	\
-		       base1, base2, base3)		\
-							\
-static kobj_class_t name ## _baseclasses[] =		\
-	{ &base1,					\
-	  &base2,					\
-	  &base3, NULL };				\
-struct kobj_class classvar = {				\
-	#name, methods, size, name ## _baseclasses	\
+#define DEFINE_CLASS_3(_name, classvar, _methods, _size,	\
+		       base1, base2, base3)			\
+								\
+static kobj_class_t _name ## _baseclasses[] =			\
+	{ &base1, &base2, &base3, NULL };			\
+struct kobj_class classvar = {					\
+	.name = #_name,						\
+	.methods = _methods,					\
+	.size = _size,						\
+	.baseclasses = _name ## _baseclasses,			\
 }
 
 /*