| Message ID | 20241103133412.73536-23-shentey@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | E500 Cleanup | expand |
On Sun, Nov 03, 2024 at 02:34:08PM +0100, Bernhard Beschow wrote: > Reviewed-by: Cédric Le Goater <clg@redhat.com> > Signed-off-by: Bernhard Beschow <shentey@gmail.com> Yeah, I think this is best. Acked-by: Corey Minyard <cminyard@mvista.com> > --- > hw/i2c/smbus_eeprom.c | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > > diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c > index 9e62c27a1a..e3e96d4a2d 100644 > --- a/hw/i2c/smbus_eeprom.c > +++ b/hw/i2c/smbus_eeprom.c > @@ -151,19 +151,16 @@ static void smbus_eeprom_class_initfn(ObjectClass *klass, void *data) > dc->user_creatable = false; > } > > -static const TypeInfo smbus_eeprom_info = { > - .name = TYPE_SMBUS_EEPROM, > - .parent = TYPE_SMBUS_DEVICE, > - .instance_size = sizeof(SMBusEEPROMDevice), > - .class_init = smbus_eeprom_class_initfn, > +static const TypeInfo smbus_eeprom_types[] = { > + { > + .name = TYPE_SMBUS_EEPROM, > + .parent = TYPE_SMBUS_DEVICE, > + .instance_size = sizeof(SMBusEEPROMDevice), > + .class_init = smbus_eeprom_class_initfn, > + }, > }; > > -static void smbus_eeprom_register_types(void) > -{ > - type_register_static(&smbus_eeprom_info); > -} > - > -type_init(smbus_eeprom_register_types) > +DEFINE_TYPES(smbus_eeprom_types) > > void smbus_eeprom_init_one(I2CBus *smbus, uint8_t address, uint8_t *eeprom_buf) > { > -- > 2.47.0 > >
diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c index 9e62c27a1a..e3e96d4a2d 100644 --- a/hw/i2c/smbus_eeprom.c +++ b/hw/i2c/smbus_eeprom.c @@ -151,19 +151,16 @@ static void smbus_eeprom_class_initfn(ObjectClass *klass, void *data) dc->user_creatable = false; } -static const TypeInfo smbus_eeprom_info = { - .name = TYPE_SMBUS_EEPROM, - .parent = TYPE_SMBUS_DEVICE, - .instance_size = sizeof(SMBusEEPROMDevice), - .class_init = smbus_eeprom_class_initfn, +static const TypeInfo smbus_eeprom_types[] = { + { + .name = TYPE_SMBUS_EEPROM, + .parent = TYPE_SMBUS_DEVICE, + .instance_size = sizeof(SMBusEEPROMDevice), + .class_init = smbus_eeprom_class_initfn, + }, }; -static void smbus_eeprom_register_types(void) -{ - type_register_static(&smbus_eeprom_info); -} - -type_init(smbus_eeprom_register_types) +DEFINE_TYPES(smbus_eeprom_types) void smbus_eeprom_init_one(I2CBus *smbus, uint8_t address, uint8_t *eeprom_buf) {