Replace the legacy type_register_static()/type_init() registration pattern with the modern DEFINE_TYPES() macro.
Inline 9 standalone TypeInfo variables (aspeed_intc_info as abstract base, aspeed_2700_intc_info, aspeed_2700_intcio_info, aspeed_2700_intcioexp1_info, aspeed_2700_intcioexp2_info, aspeed_2700ssp_intc_info, aspeed_2700ssp_intcio_info, aspeed_2700tsp_intc_info, aspeed_2700tsp_intcio_info) directly into the 'aspeed_intc_types[]' array, removing the need for separate declarations. No functional change. Signed-off-by: Jamin Lin <[email protected]> --- hw/intc/aspeed_intc.c | 121 ++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 70 deletions(-) diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c index 3892809430..5a36fff520 100644 --- a/hw/intc/aspeed_intc.c +++ b/hw/intc/aspeed_intc.c @@ -758,16 +758,6 @@ static void aspeed_intc_class_init(ObjectClass *klass, const void *data) aic->reg_ops = &aspeed_intc_ops; } -static const TypeInfo aspeed_intc_info = { - .name = TYPE_ASPEED_INTC, - .parent = TYPE_SYS_BUS_DEVICE, - .instance_init = aspeed_intc_instance_init, - .instance_size = sizeof(AspeedINTCState), - .class_init = aspeed_intc_class_init, - .class_size = sizeof(AspeedINTCClass), - .abstract = true, -}; - static AspeedINTCIRQ aspeed_2700_intc_irqs[ASPEED_INTC_MAX_INPINS] = { {0, 0, 10, R_GICINT192_201_EN, R_GICINT192_201_STATUS}, }; @@ -788,12 +778,6 @@ static void aspeed_2700_intc_class_init(ObjectClass *klass, const void *data) aic->irq_table_count = ARRAY_SIZE(aspeed_2700_intc_irqs); } -static const TypeInfo aspeed_2700_intc_info = { - .name = TYPE_ASPEED_2700_INTC, - .parent = TYPE_ASPEED_INTC, - .class_init = aspeed_2700_intc_class_init, -}; - static AspeedINTCIRQ aspeed_2700_intcioexp2_irqs[ASPEED_INTC_MAX_INPINS] = { {0, 8, 1, R_GICINT192_EN, R_GICINT192_STATUS}, {1, 9, 1, R_GICINT193_EN, R_GICINT193_STATUS}, @@ -817,12 +801,6 @@ static void aspeed_2700_intcioexp2_class_init(ObjectClass *klass, aic->irq_table_count = ARRAY_SIZE(aspeed_2700_intcioexp2_irqs); } -static const TypeInfo aspeed_2700_intcioexp2_info = { - .name = TYPE_ASPEED_2700_INTCIOEXP2, - .parent = TYPE_ASPEED_INTC, - .class_init = aspeed_2700_intcioexp2_class_init, -}; - static AspeedINTCIRQ aspeed_2700_intcioexp1_irqs[ASPEED_INTC_MAX_INPINS] = { {0, 6, 1, R_GICINT192_EN, R_GICINT192_STATUS}, {1, 7, 1, R_GICINT193_EN, R_GICINT193_STATUS}, @@ -846,12 +824,6 @@ static void aspeed_2700_intcioexp1_class_init(ObjectClass *klass, aic->irq_table_count = ARRAY_SIZE(aspeed_2700_intcioexp1_irqs); } -static const TypeInfo aspeed_2700_intcioexp1_info = { - .name = TYPE_ASPEED_2700_INTCIOEXP1, - .parent = TYPE_ASPEED_INTC, - .class_init = aspeed_2700_intcioexp1_class_init, -}; - static AspeedINTCIRQ aspeed_2700_intcio_irqs[ASPEED_INTC_MAX_INPINS] = { {0, 0, 1, R_GICINT192_EN, R_GICINT192_STATUS}, {1, 1, 1, R_GICINT193_EN, R_GICINT193_STATUS}, @@ -878,12 +850,6 @@ static void aspeed_2700_intcio_class_init(ObjectClass *klass, const void *data) aic->irq_table_count = ARRAY_SIZE(aspeed_2700_intcio_irqs); } -static const TypeInfo aspeed_2700_intcio_info = { - .name = TYPE_ASPEED_2700_INTCIO, - .parent = TYPE_ASPEED_INTC, - .class_init = aspeed_2700_intcio_class_init, -}; - static AspeedINTCIRQ aspeed_2700ssp_intc_irqs[ASPEED_INTC_MAX_INPINS] = { {0, 0, 10, R_SSPINT160_169_EN, R_SSPINT160_169_STATUS}, }; @@ -905,12 +871,6 @@ static void aspeed_2700ssp_intc_class_init(ObjectClass *klass, const void *data) aic->irq_table_count = ARRAY_SIZE(aspeed_2700ssp_intc_irqs); } -static const TypeInfo aspeed_2700ssp_intc_info = { - .name = TYPE_ASPEED_2700SSP_INTC, - .parent = TYPE_ASPEED_INTC, - .class_init = aspeed_2700ssp_intc_class_init, -}; - static AspeedINTCIRQ aspeed_2700ssp_intcio_irqs[ASPEED_INTC_MAX_INPINS] = { {0, 0, 1, R_SSPINT160_EN, R_SSPINT160_STATUS}, {1, 1, 1, R_SSPINT161_EN, R_SSPINT161_STATUS}, @@ -938,12 +898,6 @@ static void aspeed_2700ssp_intcio_class_init(ObjectClass *klass, aic->irq_table_count = ARRAY_SIZE(aspeed_2700ssp_intcio_irqs); } -static const TypeInfo aspeed_2700ssp_intcio_info = { - .name = TYPE_ASPEED_2700SSP_INTCIO, - .parent = TYPE_ASPEED_INTC, - .class_init = aspeed_2700ssp_intcio_class_init, -}; - static AspeedINTCIRQ aspeed_2700tsp_intc_irqs[ASPEED_INTC_MAX_INPINS] = { {0, 0, 10, R_TSPINT160_169_EN, R_TSPINT160_169_STATUS}, }; @@ -965,12 +919,6 @@ static void aspeed_2700tsp_intc_class_init(ObjectClass *klass, const void *data) aic->irq_table_count = ARRAY_SIZE(aspeed_2700tsp_intc_irqs); } -static const TypeInfo aspeed_2700tsp_intc_info = { - .name = TYPE_ASPEED_2700TSP_INTC, - .parent = TYPE_ASPEED_INTC, - .class_init = aspeed_2700tsp_intc_class_init, -}; - static AspeedINTCIRQ aspeed_2700tsp_intcio_irqs[ASPEED_INTC_MAX_INPINS] = { {0, 0, 1, R_TSPINT160_EN, R_TSPINT160_STATUS}, {1, 1, 1, R_TSPINT161_EN, R_TSPINT161_STATUS}, @@ -998,23 +946,56 @@ static void aspeed_2700tsp_intcio_class_init(ObjectClass *klass, aic->irq_table_count = ARRAY_SIZE(aspeed_2700tsp_intcio_irqs); } -static const TypeInfo aspeed_2700tsp_intcio_info = { - .name = TYPE_ASPEED_2700TSP_INTCIO, - .parent = TYPE_ASPEED_INTC, - .class_init = aspeed_2700tsp_intcio_class_init, +static const TypeInfo aspeed_intc_types[] = { + { + .name = TYPE_ASPEED_INTC, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_init = aspeed_intc_instance_init, + .instance_size = sizeof(AspeedINTCState), + .class_init = aspeed_intc_class_init, + .class_size = sizeof(AspeedINTCClass), + .abstract = true, + }, + { + .name = TYPE_ASPEED_2700_INTC, + .parent = TYPE_ASPEED_INTC, + .class_init = aspeed_2700_intc_class_init, + }, + { + .name = TYPE_ASPEED_2700_INTCIO, + .parent = TYPE_ASPEED_INTC, + .class_init = aspeed_2700_intcio_class_init, + }, + { + .name = TYPE_ASPEED_2700SSP_INTC, + .parent = TYPE_ASPEED_INTC, + .class_init = aspeed_2700ssp_intc_class_init, + }, + { + .name = TYPE_ASPEED_2700SSP_INTCIO, + .parent = TYPE_ASPEED_INTC, + .class_init = aspeed_2700ssp_intcio_class_init, + }, + { + .name = TYPE_ASPEED_2700TSP_INTC, + .parent = TYPE_ASPEED_INTC, + .class_init = aspeed_2700tsp_intc_class_init, + }, + { + .name = TYPE_ASPEED_2700TSP_INTCIO, + .parent = TYPE_ASPEED_INTC, + .class_init = aspeed_2700tsp_intcio_class_init, + }, + { + .name = TYPE_ASPEED_2700_INTCIOEXP1, + .parent = TYPE_ASPEED_INTC, + .class_init = aspeed_2700_intcioexp1_class_init, + }, + { + .name = TYPE_ASPEED_2700_INTCIOEXP2, + .parent = TYPE_ASPEED_INTC, + .class_init = aspeed_2700_intcioexp2_class_init, + } }; -static void aspeed_intc_register_types(void) -{ - type_register_static(&aspeed_intc_info); - type_register_static(&aspeed_2700_intc_info); - type_register_static(&aspeed_2700_intcio_info); - type_register_static(&aspeed_2700_intcioexp1_info); - type_register_static(&aspeed_2700_intcioexp2_info); - type_register_static(&aspeed_2700ssp_intc_info); - type_register_static(&aspeed_2700ssp_intcio_info); - type_register_static(&aspeed_2700tsp_intc_info); - type_register_static(&aspeed_2700tsp_intcio_info); -} - -type_init(aspeed_intc_register_types); +DEFINE_TYPES(aspeed_intc_types) -- 2.43.0
