From: Jamin Lin <[email protected]> Replace the legacy type_register_static()/type_init() registration pattern with the modern DEFINE_TYPES() macro.
Inline 6 standalone TypeInfo variables (aspeed_timer_info as abstract base, aspeed_2400_timer_info, aspeed_2500_timer_info, aspeed_2600_timer_info, aspeed_1030_timer_info, aspeed_2700_timer_info) directly into the 'aspeed_timer_types[]' array, removing the need for separate declarations. No functional change. Signed-off-by: Jamin Lin <[email protected]> Reviewed-by: Cédric Le Goater <[email protected]> Link: https://lore.kernel.org/qemu-devel/[email protected] Signed-off-by: Cédric Le Goater <[email protected]> --- hw/timer/aspeed_timer.c | 83 +++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 48 deletions(-) diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c index 69f5c89215c5..a607736387c8 100644 --- a/hw/timer/aspeed_timer.c +++ b/hw/timer/aspeed_timer.c @@ -907,15 +907,6 @@ static void timer_class_init(ObjectClass *klass, const void *data) device_class_set_props(dc, aspeed_timer_properties); } -static const TypeInfo aspeed_timer_info = { - .name = TYPE_ASPEED_TIMER, - .parent = TYPE_SYS_BUS_DEVICE, - .instance_size = sizeof(AspeedTimerCtrlState), - .class_init = timer_class_init, - .class_size = sizeof(AspeedTimerClass), - .abstract = true, -}; - static void aspeed_2400_timer_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -926,12 +917,6 @@ static void aspeed_2400_timer_class_init(ObjectClass *klass, const void *data) awc->write = aspeed_2400_timer_write; } -static const TypeInfo aspeed_2400_timer_info = { - .name = TYPE_ASPEED_2400_TIMER, - .parent = TYPE_ASPEED_TIMER, - .class_init = aspeed_2400_timer_class_init, -}; - static void aspeed_2500_timer_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -942,12 +927,6 @@ static void aspeed_2500_timer_class_init(ObjectClass *klass, const void *data) awc->write = aspeed_2500_timer_write; } -static const TypeInfo aspeed_2500_timer_info = { - .name = TYPE_ASPEED_2500_TIMER, - .parent = TYPE_ASPEED_TIMER, - .class_init = aspeed_2500_timer_class_init, -}; - static void aspeed_2600_timer_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -958,12 +937,6 @@ static void aspeed_2600_timer_class_init(ObjectClass *klass, const void *data) awc->write = aspeed_2600_timer_write; } -static const TypeInfo aspeed_2600_timer_info = { - .name = TYPE_ASPEED_2600_TIMER, - .parent = TYPE_ASPEED_TIMER, - .class_init = aspeed_2600_timer_class_init, -}; - static void aspeed_1030_timer_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -974,12 +947,6 @@ static void aspeed_1030_timer_class_init(ObjectClass *klass, const void *data) awc->write = aspeed_2600_timer_write; } -static const TypeInfo aspeed_1030_timer_info = { - .name = TYPE_ASPEED_1030_TIMER, - .parent = TYPE_ASPEED_TIMER, - .class_init = aspeed_1030_timer_class_init, -}; - static void aspeed_2700_timer_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -990,20 +957,40 @@ static void aspeed_2700_timer_class_init(ObjectClass *klass, const void *data) awc->write = aspeed_2700_timer_write; } -static const TypeInfo aspeed_2700_timer_info = { - .name = TYPE_ASPEED_2700_TIMER, - .parent = TYPE_ASPEED_TIMER, - .class_init = aspeed_2700_timer_class_init, +static const TypeInfo aspeed_timer_types[] = { + { + .name = TYPE_ASPEED_TIMER, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(AspeedTimerCtrlState), + .class_init = timer_class_init, + .class_size = sizeof(AspeedTimerClass), + .abstract = true, + }, + { + .name = TYPE_ASPEED_1030_TIMER, + .parent = TYPE_ASPEED_TIMER, + .class_init = aspeed_1030_timer_class_init, + }, + { + .name = TYPE_ASPEED_2400_TIMER, + .parent = TYPE_ASPEED_TIMER, + .class_init = aspeed_2400_timer_class_init, + }, + { + .name = TYPE_ASPEED_2500_TIMER, + .parent = TYPE_ASPEED_TIMER, + .class_init = aspeed_2500_timer_class_init, + }, + { + .name = TYPE_ASPEED_2600_TIMER, + .parent = TYPE_ASPEED_TIMER, + .class_init = aspeed_2600_timer_class_init, + }, + { + .name = TYPE_ASPEED_2700_TIMER, + .parent = TYPE_ASPEED_TIMER, + .class_init = aspeed_2700_timer_class_init, + } }; -static void aspeed_timer_register_types(void) -{ - type_register_static(&aspeed_timer_info); - type_register_static(&aspeed_2400_timer_info); - type_register_static(&aspeed_2500_timer_info); - type_register_static(&aspeed_2600_timer_info); - type_register_static(&aspeed_1030_timer_info); - type_register_static(&aspeed_2700_timer_info); -} - -type_init(aspeed_timer_register_types) +DEFINE_TYPES(aspeed_timer_types) -- 2.54.0
