13 files changed, 28 insertions, 37 deletions
diff --git a/sys/geom/bde/g_bde.c b/sys/geom/bde/g_bde.c
index 9e5ee6cebf6c..6ab96a202c65 100644
--- a/sys/geom/bde/g_bde.c
+++ b/sys/geom/bde/g_bde.c
@@ -271,9 +271,8 @@ g_bde_config(struct g_configargs *ga)
 }
 
 static struct g_class g_bde_class	= {
-	BDE_CLASS_NAME,
-	NULL,
-	g_bde_config,
+	.name = BDE_CLASS_NAME,
+	.config = g_bde_config,
 	G_CLASS_INITIALIZER
 };
 
diff --git a/sys/geom/geom.h b/sys/geom/geom.h
index 169da266971c..f6f2cdb742a0 100644
--- a/sys/geom/geom.h
+++ b/sys/geom/geom.h
@@ -100,7 +100,11 @@ struct g_class {
 	u_int			protect;
 };
 
-#define G_CLASS_INITIALIZER { 0, 0 }, { 0 }, 0, 0
+#define G_CLASS_INITIALIZER 	\
+	.class = { 0, 0 },	\
+	.geom = { 0 },		\
+	.event = 0,		\
+	.protect = 0	
 
 /*
  * The g_geom is an instance of a g_class.
diff --git a/sys/geom/geom_aes.c b/sys/geom/geom_aes.c
index 72f0d3dcc56f..481483577e4e 100644
--- a/sys/geom/geom_aes.c
+++ b/sys/geom/geom_aes.c
@@ -383,9 +383,8 @@ g_aes_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 }
 
 static struct g_class g_aes_class	= {
-	AES_CLASS_NAME,
-	g_aes_taste,
-	NULL,
+	.name = AES_CLASS_NAME,
+	.taste = g_aes_taste,
 	G_CLASS_INITIALIZER
 };
 
diff --git a/sys/geom/geom_apple.c b/sys/geom/geom_apple.c
index b4ddfae58100..8bcec691c140 100644
--- a/sys/geom/geom_apple.c
+++ b/sys/geom/geom_apple.c
@@ -273,9 +273,8 @@ g_apple_taste(struct g_class *mp, struct g_provider *pp, int insist)
 
 
 static struct g_class g_apple_class	= {
-	APPLE_CLASS_NAME,
-	g_apple_taste,
-	NULL,
+	.name = APPLE_CLASS_NAME,
+	.taste = g_apple_taste,
 	G_CLASS_INITIALIZER
 };
 
diff --git a/sys/geom/geom_bsd.c b/sys/geom/geom_bsd.c
index 9a76f70b0ac9..6e143330baf5 100644
--- a/sys/geom/geom_bsd.c
+++ b/sys/geom/geom_bsd.c
@@ -928,9 +928,8 @@ g_bsd_taste(struct g_class *mp, struct g_provider *pp, int flags)
 
 /* Finally, register with GEOM infrastructure. */
 static struct g_class g_bsd_class = {
-	BSD_CLASS_NAME,
-	g_bsd_taste,
-	NULL,
+	.name = BSD_CLASS_NAME,
+	.taste = g_bsd_taste,
 	G_CLASS_INITIALIZER
 };
 
diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c
index 8bf5f3915cb8..3b217e66276f 100644
--- a/sys/geom/geom_dev.c
+++ b/sys/geom/geom_dev.c
@@ -72,9 +72,8 @@ static g_taste_t g_dev_taste;
 static g_orphan_t g_dev_orphan;
 
 static struct g_class g_dev_class	= {
-	"DEV",
-	g_dev_taste,
-	NULL,
+	.name = "DEV",
+	.taste = g_dev_taste,
 	G_CLASS_INITIALIZER
 };
 
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 6ac4a59008c0..e79fe64e57e9 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -60,9 +60,7 @@ static struct mtx g_disk_done_mtx;
 static g_access_t g_disk_access;
 
 struct g_class g_disk_class = {
-	"DISK",
-	NULL,
-	NULL,
+	.name = "DISK",
 	G_CLASS_INITIALIZER
 };
 
diff --git a/sys/geom/geom_gpt.c b/sys/geom/geom_gpt.c
index 6b046c449809..d51a8243e1f2 100644
--- a/sys/geom/geom_gpt.c
+++ b/sys/geom/geom_gpt.c
@@ -253,9 +253,8 @@ g_gpt_taste(struct g_class *mp, struct g_provider *pp, int insist)
 }
 
 static struct g_class g_gpt_class = {
-	"GPT",
-	g_gpt_taste,
-	NULL,
+	.name = "GPT",
+	.taste = g_gpt_taste,
 	G_CLASS_INITIALIZER
 };
 
diff --git a/sys/geom/geom_mbr.c b/sys/geom/geom_mbr.c
index 8659665ac387..b60bc22edbe8 100644
--- a/sys/geom/geom_mbr.c
+++ b/sys/geom/geom_mbr.c
@@ -331,9 +331,8 @@ g_mbr_taste(struct g_class *mp, struct g_provider *pp, int insist)
 }
 
 static struct g_class g_mbr_class	= {
-	MBR_CLASS_NAME,
-	g_mbr_taste,
-	NULL,
+	.name = MBR_CLASS_NAME,
+	.taste = g_mbr_taste,
 	G_CLASS_INITIALIZER
 };
 
diff --git a/sys/geom/geom_mirror.c b/sys/geom/geom_mirror.c
index 23e2f5244023..0e72b1ec1d85 100644
--- a/sys/geom/geom_mirror.c
+++ b/sys/geom/geom_mirror.c
@@ -241,9 +241,8 @@ g_mirror_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 #define MIRROR_CLASS_NAME "MIRROR"
 
 static struct g_class g_mirror_class	= {
-	MIRROR_CLASS_NAME,
-	g_mirror_taste,
-	NULL,
+	.name = MIRROR_CLASS_NAME,
+	.taste = g_mirror_taste,
 	G_CLASS_INITIALIZER
 };
 
diff --git a/sys/geom/geom_pc98.c b/sys/geom/geom_pc98.c
index 73910d08b0fe..443d9236f13b 100644
--- a/sys/geom/geom_pc98.c
+++ b/sys/geom/geom_pc98.c
@@ -342,9 +342,8 @@ g_pc98_taste(struct g_class *mp, struct g_provider *pp, int flags)
 }
 
 static struct g_class g_pc98_class = {
-	PC98_CLASS_NAME,
-	g_pc98_taste,
-	NULL,
+	.name = PC98_CLASS_NAME,
+	.taste = g_pc98_taste,
 	G_CLASS_INITIALIZER
 };
 
diff --git a/sys/geom/geom_sunlabel.c b/sys/geom/geom_sunlabel.c
index 0e77734a9908..80da2e571aab 100644
--- a/sys/geom/geom_sunlabel.c
+++ b/sys/geom/geom_sunlabel.c
@@ -221,9 +221,8 @@ g_sunlabel_taste(struct g_class *mp, struct g_provider *pp, int flags)
 }
 
 static struct g_class g_sunlabel_class = {
-	SUNLABEL_CLASS_NAME,
-	g_sunlabel_taste,
-	NULL,
+	.name = SUNLABEL_CLASS_NAME,
+	.taste = g_sunlabel_taste,
 	G_CLASS_INITIALIZER
 };
 
diff --git a/sys/geom/geom_vol_ffs.c b/sys/geom/geom_vol_ffs.c
index 380656cabf97..9b320fb13f78 100644
--- a/sys/geom/geom_vol_ffs.c
+++ b/sys/geom/geom_vol_ffs.c
@@ -144,9 +144,8 @@ g_vol_ffs_taste(struct g_class *mp, struct g_provider *pp, int flags)
 }
 
 static struct g_class g_vol_ffs_class	= {
-	VOL_FFS_CLASS_NAME,
-	g_vol_ffs_taste,
-	NULL,
+	.name = VOL_FFS_CLASS_NAME,
+	.taste = g_vol_ffs_taste,
 	G_CLASS_INITIALIZER
 };