Message ID | 20240923093016.66437-15-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/gpio/mpc8xxx.c | 22 +++++++++------------- > 1 file changed, 9 insertions(+), 13 deletions(-) > > diff --git a/hw/gpio/mpc8xxx.c b/hw/gpio/mpc8xxx.c > index 63b7a5c881..de183c3be5 100644 > --- a/hw/gpio/mpc8xxx.c > +++ b/hw/gpio/mpc8xxx.c > @@ -23,7 +23,6 @@ > #include "hw/irq.h" > #include "hw/sysbus.h" > #include "migration/vmstate.h" > -#include "qemu/module.h" > #include "qom/object.h" > > #define TYPE_MPC8XXX_GPIO "mpc8xxx_gpio" > @@ -208,17 +207,14 @@ static void mpc8xxx_gpio_class_init(ObjectClass *klass, void *data) > device_class_set_legacy_reset(dc, mpc8xxx_gpio_reset); > } > > -static const TypeInfo mpc8xxx_gpio_info = { > - .name = TYPE_MPC8XXX_GPIO, > - .parent = TYPE_SYS_BUS_DEVICE, > - .instance_size = sizeof(MPC8XXXGPIOState), > - .instance_init = mpc8xxx_gpio_initfn, > - .class_init = mpc8xxx_gpio_class_init, > +static const TypeInfo types[] = { > + { > + .name = TYPE_MPC8XXX_GPIO, > + .parent = TYPE_SYS_BUS_DEVICE, > + .instance_size = sizeof(MPC8XXXGPIOState), > + .instance_init = mpc8xxx_gpio_initfn, > + .class_init = mpc8xxx_gpio_class_init, > + }, > }; > > -static void mpc8xxx_gpio_register_types(void) > -{ > - type_register_static(&mpc8xxx_gpio_info); > -} > - > -type_init(mpc8xxx_gpio_register_types) > +DEFINE_TYPES(types)
diff --git a/hw/gpio/mpc8xxx.c b/hw/gpio/mpc8xxx.c index 63b7a5c881..de183c3be5 100644 --- a/hw/gpio/mpc8xxx.c +++ b/hw/gpio/mpc8xxx.c @@ -23,7 +23,6 @@ #include "hw/irq.h" #include "hw/sysbus.h" #include "migration/vmstate.h" -#include "qemu/module.h" #include "qom/object.h" #define TYPE_MPC8XXX_GPIO "mpc8xxx_gpio" @@ -208,17 +207,14 @@ static void mpc8xxx_gpio_class_init(ObjectClass *klass, void *data) device_class_set_legacy_reset(dc, mpc8xxx_gpio_reset); } -static const TypeInfo mpc8xxx_gpio_info = { - .name = TYPE_MPC8XXX_GPIO, - .parent = TYPE_SYS_BUS_DEVICE, - .instance_size = sizeof(MPC8XXXGPIOState), - .instance_init = mpc8xxx_gpio_initfn, - .class_init = mpc8xxx_gpio_class_init, +static const TypeInfo types[] = { + { + .name = TYPE_MPC8XXX_GPIO, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(MPC8XXXGPIOState), + .instance_init = mpc8xxx_gpio_initfn, + .class_init = mpc8xxx_gpio_class_init, + }, }; -static void mpc8xxx_gpio_register_types(void) -{ - type_register_static(&mpc8xxx_gpio_info); -} - -type_init(mpc8xxx_gpio_register_types) +DEFINE_TYPES(types)
Signed-off-by: Bernhard Beschow <shentey@gmail.com> --- hw/gpio/mpc8xxx.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)