Remove the G_CLASS_INITIALIZER, we do not need it anymore.

14 files changed, 2 insertions, 22 deletions

diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index 1577f0226db1..32ed47f421ce 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -341,7 +341,6 @@ s_write(struct indir *ip, off_t offset, uintptr_t ptr)
 
 struct g_class g_md_class = {
 	.name = "MD",
-	G_CLASS_INITIALIZER
 };
 
 static int
diff --git a/sys/geom/bde/g_bde.c b/sys/geom/bde/g_bde.c
index d0a986f08983..e2b9bc0a4ea4 100644
--- a/sys/geom/bde/g_bde.c
+++ b/sys/geom/bde/g_bde.c
@@ -285,7 +285,6 @@ static struct g_class g_bde_class	= {
 	.name = BDE_CLASS_NAME,
 	.create_geom = g_bde_create_geom,
 	.destroy_geom = g_bde_destroy_geom,
-	G_CLASS_INITIALIZER
 };
 
 DECLARE_GEOM_CLASS(g_bde_class, g_bde);
diff --git a/sys/geom/geom.h b/sys/geom/geom.h
index d90d2ce2b285..73121edb03b3 100644
--- a/sys/geom/geom.h
+++ b/sys/geom/geom.h
@@ -89,19 +89,13 @@ struct g_class {
 	g_ctl_destroy_geom_t	*destroy_geom;
 	g_ctl_config_geom_t	*config_geom;
 	/*
-	 * The remaning elements are private and classes should use
-	 * the G_CLASS_INITIALIZER macro to initialize them.
-         */
+	 * The remaining elements are private
+	 */
 	LIST_ENTRY(g_class)	class;
 	LIST_HEAD(,g_geom)	geom;
 	u_int			protect;
 };
 
-#define G_CLASS_INITIALIZER 	\
-	.class = { 0, 0 },	\
-	.geom = { 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 c9e168701253..aa580cf30f96 100644
--- a/sys/geom/geom_aes.c
+++ b/sys/geom/geom_aes.c
@@ -372,7 +372,6 @@ g_aes_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 static struct g_class g_aes_class	= {
 	.name = AES_CLASS_NAME,
 	.taste = g_aes_taste,
-	G_CLASS_INITIALIZER
 };
 
 DECLARE_GEOM_CLASS(g_aes_class, g_aes);
diff --git a/sys/geom/geom_apple.c b/sys/geom/geom_apple.c
index 24bd909b98ab..b8cd8d5bd94a 100644
--- a/sys/geom/geom_apple.c
+++ b/sys/geom/geom_apple.c
@@ -262,7 +262,6 @@ g_apple_taste(struct g_class *mp, struct g_provider *pp, int insist)
 static struct g_class g_apple_class	= {
 	.name = APPLE_CLASS_NAME,
 	.taste = g_apple_taste,
-	G_CLASS_INITIALIZER
 };
 
 DECLARE_GEOM_CLASS(g_apple_class, g_apple);
diff --git a/sys/geom/geom_bsd.c b/sys/geom/geom_bsd.c
index 89b9a30d4443..63dc8303272f 100644
--- a/sys/geom/geom_bsd.c
+++ b/sys/geom/geom_bsd.c
@@ -754,7 +754,6 @@ static struct g_class g_bsd_class = {
 	.name = BSD_CLASS_NAME,
 	.taste = g_bsd_taste,
 	.config_geom = g_bsd_config,
-	G_CLASS_INITIALIZER
 };
 
 DECLARE_GEOM_CLASS(g_bsd_class, g_bsd);
diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c
index 2c69f884c325..ac812fe93176 100644
--- a/sys/geom/geom_dev.c
+++ b/sys/geom/geom_dev.c
@@ -74,7 +74,6 @@ static g_orphan_t g_dev_orphan;
 static struct g_class g_dev_class	= {
 	.name = "DEV",
 	.taste = g_dev_taste,
-	G_CLASS_INITIALIZER
 };
 
 int
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 83d55b2c2e8f..a6ce15e51836 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -61,7 +61,6 @@ static g_access_t g_disk_access;
 
 struct g_class g_disk_class = {
 	.name = "DISK",
-	G_CLASS_INITIALIZER
 };
 
 static void
diff --git a/sys/geom/geom_gpt.c b/sys/geom/geom_gpt.c
index 89853e735fb4..e468598c52ac 100644
--- a/sys/geom/geom_gpt.c
+++ b/sys/geom/geom_gpt.c
@@ -226,7 +226,6 @@ g_gpt_taste(struct g_class *mp, struct g_provider *pp, int insist)
 static struct g_class g_gpt_class = {
 	.name = "GPT",
 	.taste = g_gpt_taste,
-	G_CLASS_INITIALIZER
 };
 
 DECLARE_GEOM_CLASS(g_gpt_class, g_gpt);
diff --git a/sys/geom/geom_mbr.c b/sys/geom/geom_mbr.c
index c0232a7ebb50..cc28b103adf9 100644
--- a/sys/geom/geom_mbr.c
+++ b/sys/geom/geom_mbr.c
@@ -309,7 +309,6 @@ g_mbr_taste(struct g_class *mp, struct g_provider *pp, int insist)
 static struct g_class g_mbr_class	= {
 	.name = MBR_CLASS_NAME,
 	.taste = g_mbr_taste,
-	G_CLASS_INITIALIZER
 };
 
 DECLARE_GEOM_CLASS(g_mbr_class, g_mbr);
@@ -452,7 +451,6 @@ g_mbrext_taste(struct g_class *mp, struct g_provider *pp, int insist __unused)
 static struct g_class g_mbrext_class	= {
 	.name = MBREXT_CLASS_NAME,
 	.taste = g_mbrext_taste,
-	G_CLASS_INITIALIZER
 };
 
 DECLARE_GEOM_CLASS(g_mbrext_class, g_mbrext);
diff --git a/sys/geom/geom_mirror.c b/sys/geom/geom_mirror.c
index 2b6b2890dd1d..09e7f549486b 100644
--- a/sys/geom/geom_mirror.c
+++ b/sys/geom/geom_mirror.c
@@ -232,7 +232,6 @@ g_mirror_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 static struct g_class g_mirror_class	= {
 	.name = MIRROR_CLASS_NAME,
 	.taste = g_mirror_taste,
-	G_CLASS_INITIALIZER
 };
 
 DECLARE_GEOM_CLASS(g_mirror_class, g_mirror);
diff --git a/sys/geom/geom_pc98.c b/sys/geom/geom_pc98.c
index c80bd8a8ef5a..e28a27687c64 100644
--- a/sys/geom/geom_pc98.c
+++ b/sys/geom/geom_pc98.c
@@ -317,7 +317,6 @@ g_pc98_taste(struct g_class *mp, struct g_provider *pp, int flags)
 static struct g_class g_pc98_class = {
 	.name = PC98_CLASS_NAME,
 	.taste = g_pc98_taste,
-	G_CLASS_INITIALIZER
 };
 
 DECLARE_GEOM_CLASS(g_pc98_class, g_pc98);
diff --git a/sys/geom/geom_sunlabel.c b/sys/geom/geom_sunlabel.c
index cb14831900fd..9403f3d96f64 100644
--- a/sys/geom/geom_sunlabel.c
+++ b/sys/geom/geom_sunlabel.c
@@ -282,7 +282,6 @@ static struct g_class g_sunlabel_class = {
 	.name = SUNLABEL_CLASS_NAME,
 	.taste = g_sunlabel_taste,
 	.config_geom = g_sunlabel_config,
-	G_CLASS_INITIALIZER
 };
 
 DECLARE_GEOM_CLASS(g_sunlabel_class, g_sunlabel);
diff --git a/sys/geom/geom_vol_ffs.c b/sys/geom/geom_vol_ffs.c
index 6614f0139e59..4979bc91b97c 100644
--- a/sys/geom/geom_vol_ffs.c
+++ b/sys/geom/geom_vol_ffs.c
@@ -137,7 +137,6 @@ g_vol_ffs_taste(struct g_class *mp, struct g_provider *pp, int flags)
 static struct g_class g_vol_ffs_class	= {
 	.name = VOL_FFS_CLASS_NAME,
 	.taste = g_vol_ffs_taste,
-	G_CLASS_INITIALIZER
 };
 
 DECLARE_GEOM_CLASS(g_vol_ffs_class, g_vol_ffs);