Replace the legacy type_register_static()/type_init() registration pattern with the modern DEFINE_TYPES() macro.
Inline 5 standalone TypeInfo variables (aspeed_sdmc_info as abstract base, aspeed_2400_sdmc_info, aspeed_2500_sdmc_info, aspeed_2600_sdmc_info, aspeed_2700_sdmc_info) directly into the 'aspeed_sdmc_types[]' array, removing the need for separate declarations. No functional change. Signed-off-by: Jamin Lin <[email protected]> --- hw/misc/aspeed_sdmc.c | 73 ++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 42 deletions(-) diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c index 055abf7f50..f8fbaebee6 100644 --- a/hw/misc/aspeed_sdmc.c +++ b/hw/misc/aspeed_sdmc.c @@ -310,16 +310,6 @@ static void aspeed_sdmc_class_init(ObjectClass *klass, const void *data) device_class_set_props(dc, aspeed_sdmc_properties); } -static const TypeInfo aspeed_sdmc_info = { - .name = TYPE_ASPEED_SDMC, - .parent = TYPE_SYS_BUS_DEVICE, - .instance_size = sizeof(AspeedSDMCState), - .instance_init = aspeed_sdmc_initfn, - .class_init = aspeed_sdmc_class_init, - .class_size = sizeof(AspeedSDMCClass), - .abstract = true, -}; - static int aspeed_sdmc_get_ram_bits(AspeedSDMCState *s) { AspeedSDMCClass *asc = ASPEED_SDMC_GET_CLASS(s); @@ -393,12 +383,6 @@ static void aspeed_2400_sdmc_class_init(ObjectClass *klass, const void *data) asc->valid_ram_sizes = aspeed_2400_ram_sizes; } -static const TypeInfo aspeed_2400_sdmc_info = { - .name = TYPE_ASPEED_2400_SDMC, - .parent = TYPE_ASPEED_SDMC, - .class_init = aspeed_2400_sdmc_class_init, -}; - static uint32_t aspeed_2500_sdmc_compute_conf(AspeedSDMCState *s, uint32_t data) { uint32_t fixed_conf = ASPEED_SDMC_HW_VERSION(1) | @@ -461,12 +445,6 @@ static void aspeed_2500_sdmc_class_init(ObjectClass *klass, const void *data) asc->valid_ram_sizes = aspeed_2500_ram_sizes; } -static const TypeInfo aspeed_2500_sdmc_info = { - .name = TYPE_ASPEED_2500_SDMC, - .parent = TYPE_ASPEED_SDMC, - .class_init = aspeed_2500_sdmc_class_init, -}; - static uint32_t aspeed_2600_sdmc_compute_conf(AspeedSDMCState *s, uint32_t data) { uint32_t fixed_conf = ASPEED_SDMC_HW_VERSION(3) | @@ -555,12 +533,6 @@ static void aspeed_2600_sdmc_class_init(ObjectClass *klass, const void *data) asc->valid_ram_sizes = aspeed_2600_ram_sizes; } -static const TypeInfo aspeed_2600_sdmc_info = { - .name = TYPE_ASPEED_2600_SDMC, - .parent = TYPE_ASPEED_SDMC, - .class_init = aspeed_2600_sdmc_class_init, -}; - static void aspeed_2700_sdmc_reset_hold(Object *obj, ResetType type) { AspeedSDMCState *s = ASPEED_SDMC(obj); @@ -690,19 +662,36 @@ static void aspeed_2700_sdmc_class_init(ObjectClass *klass, const void *data) asc->valid_ram_sizes = aspeed_2700_ram_sizes; } -static const TypeInfo aspeed_2700_sdmc_info = { - .name = TYPE_ASPEED_2700_SDMC, - .parent = TYPE_ASPEED_SDMC, - .class_init = aspeed_2700_sdmc_class_init, +static const TypeInfo aspeed_sdmc_types[] = { + { + .name = TYPE_ASPEED_SDMC, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(AspeedSDMCState), + .instance_init = aspeed_sdmc_initfn, + .class_init = aspeed_sdmc_class_init, + .class_size = sizeof(AspeedSDMCClass), + .abstract = true, + }, + { + .name = TYPE_ASPEED_2400_SDMC, + .parent = TYPE_ASPEED_SDMC, + .class_init = aspeed_2400_sdmc_class_init, + }, + { + .name = TYPE_ASPEED_2500_SDMC, + .parent = TYPE_ASPEED_SDMC, + .class_init = aspeed_2500_sdmc_class_init, + }, + { + .name = TYPE_ASPEED_2600_SDMC, + .parent = TYPE_ASPEED_SDMC, + .class_init = aspeed_2600_sdmc_class_init, + }, + { + .name = TYPE_ASPEED_2700_SDMC, + .parent = TYPE_ASPEED_SDMC, + .class_init = aspeed_2700_sdmc_class_init, + } }; -static void aspeed_sdmc_register_types(void) -{ - type_register_static(&aspeed_sdmc_info); - type_register_static(&aspeed_2400_sdmc_info); - type_register_static(&aspeed_2500_sdmc_info); - type_register_static(&aspeed_2600_sdmc_info); - type_register_static(&aspeed_2700_sdmc_info); -} - -type_init(aspeed_sdmc_register_types); +DEFINE_TYPES(aspeed_sdmc_types) -- 2.43.0
