Remove the G_CLASS_INITIALIZER, we do not need it anymore.
This commit is contained in:
parent
8e5d2c7eca
commit
f075585f67
@ -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
|
||||
|
@ -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);
|
||||
|
@ -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.
|
||||
*/
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
@ -61,7 +61,6 @@ static g_access_t g_disk_access;
|
||||
|
||||
struct g_class g_disk_class = {
|
||||
.name = "DISK",
|
||||
G_CLASS_INITIALIZER
|
||||
};
|
||||
|
||||
static void
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user