| Message ID | 20240923093016.66437-17-shentey@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | E500 Cleanup | expand |
On 9/23/24 11:30, Bernhard Beschow wrote: > Signed-off-by: Bernhard Beschow <shentey@gmail.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/net/fsl_etsec/etsec.c | 22 +++++++++------------- > 1 file changed, 9 insertions(+), 13 deletions(-) > > diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c > index 3fdd16ef2e..9bd886b996 100644 > --- a/hw/net/fsl_etsec/etsec.c > +++ b/hw/net/fsl_etsec/etsec.c > @@ -36,7 +36,6 @@ > #include "registers.h" > #include "qapi/error.h" > #include "qemu/log.h" > -#include "qemu/module.h" > > /* #define HEX_DUMP */ > /* #define DEBUG_REGISTER */ > @@ -431,17 +430,14 @@ static void etsec_class_init(ObjectClass *klass, void *data) > dc->user_creatable = true; > } > > -static const TypeInfo etsec_info = { > - .name = TYPE_ETSEC_COMMON, > - .parent = TYPE_SYS_BUS_DEVICE, > - .instance_size = sizeof(eTSEC), > - .class_init = etsec_class_init, > - .instance_init = etsec_instance_init, > +static const TypeInfo types[] = { > + { > + .name = TYPE_ETSEC_COMMON, > + .parent = TYPE_SYS_BUS_DEVICE, > + .instance_size = sizeof(eTSEC), > + .class_init = etsec_class_init, > + .instance_init = etsec_instance_init, > + }, > }; > > -static void etsec_register_types(void) > -{ > - type_register_static(&etsec_info); > -} > - > -type_init(etsec_register_types) > +DEFINE_TYPES(types)
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index 3fdd16ef2e..9bd886b996 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -36,7 +36,6 @@ #include "registers.h" #include "qapi/error.h" #include "qemu/log.h" -#include "qemu/module.h" /* #define HEX_DUMP */ /* #define DEBUG_REGISTER */ @@ -431,17 +430,14 @@ static void etsec_class_init(ObjectClass *klass, void *data) dc->user_creatable = true; } -static const TypeInfo etsec_info = { - .name = TYPE_ETSEC_COMMON, - .parent = TYPE_SYS_BUS_DEVICE, - .instance_size = sizeof(eTSEC), - .class_init = etsec_class_init, - .instance_init = etsec_instance_init, +static const TypeInfo types[] = { + { + .name = TYPE_ETSEC_COMMON, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(eTSEC), + .class_init = etsec_class_init, + .instance_init = etsec_instance_init, + }, }; -static void etsec_register_types(void) -{ - type_register_static(&etsec_info); -} - -type_init(etsec_register_types) +DEFINE_TYPES(types)
Signed-off-by: Bernhard Beschow <shentey@gmail.com> --- hw/net/fsl_etsec/etsec.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)