diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2024-10-14 17:05:52 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2024-10-15 15:16:17 +0100 |
| commit | 85a25670683b7672c9c309678cf13bad65f26588 (patch) | |
| tree | 1e7d806550f4a9edbc9a47f02515b97285f14936 | |
| parent | 3341d1cb3786b4b60fc47fab4a4f647a7b636e76 (diff) | |
| download | qemu-85a25670683b7672c9c309678cf13bad65f26588.zip qemu-85a25670683b7672c9c309678cf13bad65f26588.tar.gz qemu-85a25670683b7672c9c309678cf13bad65f26588.tar.bz2 | |
hw/intc/omap_intc: Remove now-unnecessary abstract base class
The OMAP interrupt controller code used to have an omap-intc
class and an omap2-intc class, which shared common code via
the abstract class common-omap-intc. Now we have deleted
omap2-intc, we don't need the separate abstract base class;
fold int into omap-intc.
Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20241003135323.1653230-1-peter.maydell@linaro.org
| -rw-r--r-- | hw/intc/omap_intc.c | 11 | ||||
| -rw-r--r-- | include/hw/arm/omap.h | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index a48e6fc..a98358d 100644 --- a/hw/intc/omap_intc.c +++ b/hw/intc/omap_intc.c @@ -392,22 +392,15 @@ static void omap_intc_class_init(ObjectClass *klass, void *data) } static const TypeInfo omap_intc_info = { - .name = "omap-intc", - .parent = TYPE_OMAP_INTC, - .instance_init = omap_intc_init, - .class_init = omap_intc_class_init, -}; - -static const TypeInfo omap_intc_type_info = { .name = TYPE_OMAP_INTC, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(OMAPIntcState), - .abstract = true, + .instance_init = omap_intc_init, + .class_init = omap_intc_class_init, }; static void omap_intc_register_types(void) { - type_register_static(&omap_intc_type_info); type_register_static(&omap_intc_info); } diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index e1b6a7c..420ed1d 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -59,7 +59,7 @@ int64_t omap_clk_getrate(omap_clk clk); void omap_clk_reparent(omap_clk clk, omap_clk parent); /* omap_intc.c */ -#define TYPE_OMAP_INTC "common-omap-intc" +#define TYPE_OMAP_INTC "omap-intc" typedef struct OMAPIntcState OMAPIntcState; DECLARE_INSTANCE_CHECKER(OMAPIntcState, OMAP_INTC, TYPE_OMAP_INTC) |