Replace the legacy type_register_static()/type_init() registration pattern with the modern DEFINE_TYPES() macro.
Inline 3 standalone TypeInfo variables (aspeed_sli_info as abstract base, aspeed_2700_sli_info, aspeed_2700_sliio_info) directly into the 'aspeed_sli_types[]' array, removing the need for separate declarations. No functional change. Signed-off-by: Jamin Lin <[email protected]> --- hw/misc/aspeed_sli.c | 44 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/hw/misc/aspeed_sli.c b/hw/misc/aspeed_sli.c index 5b4d70cdc0..74ad02faf5 100644 --- a/hw/misc/aspeed_sli.c +++ b/hw/misc/aspeed_sli.c @@ -132,13 +132,6 @@ static void aspeed_sli_class_init(ObjectClass *klass, const void *data) dc->realize = aspeed_sli_realize; } -static const TypeInfo aspeed_sli_info = { - .name = TYPE_ASPEED_SLI, - .parent = TYPE_SYS_BUS_DEVICE, - .instance_size = sizeof(AspeedSLIState), - .class_init = aspeed_sli_class_init, - .abstract = true, -}; static void aspeed_2700_sli_class_init(ObjectClass *klass, const void *data) { @@ -155,23 +148,24 @@ static void aspeed_2700_sliio_class_init(ObjectClass *klass, const void *data) dc->realize = aspeed_sliio_realize; } -static const TypeInfo aspeed_2700_sli_info = { - .name = TYPE_ASPEED_2700_SLI, - .parent = TYPE_ASPEED_SLI, - .class_init = aspeed_2700_sli_class_init, -}; - -static const TypeInfo aspeed_2700_sliio_info = { - .name = TYPE_ASPEED_2700_SLIIO, - .parent = TYPE_ASPEED_SLI, - .class_init = aspeed_2700_sliio_class_init, +static const TypeInfo aspeed_sli_types[] = { + { + .name = TYPE_ASPEED_SLI, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(AspeedSLIState), + .class_init = aspeed_sli_class_init, + .abstract = true, + }, + { + .name = TYPE_ASPEED_2700_SLI, + .parent = TYPE_ASPEED_SLI, + .class_init = aspeed_2700_sli_class_init, + }, + { + .name = TYPE_ASPEED_2700_SLIIO, + .parent = TYPE_ASPEED_SLI, + .class_init = aspeed_2700_sliio_class_init, + } }; -static void aspeed_sli_register_types(void) -{ - type_register_static(&aspeed_sli_info); - type_register_static(&aspeed_2700_sli_info); - type_register_static(&aspeed_2700_sliio_info); -} - -type_init(aspeed_sli_register_types); +DEFINE_TYPES(aspeed_sli_types) -- 2.43.0
