Re: [PATCH for-9.2 40/53] hw/intc: Remove omap2-intc device

[Philippe Mathieu-Daudé]

On 3/9/24 18:07, Peter Maydell wrote:
Remove the OMAP2 specific code from omap_intc.c.
Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
---
  hw/intc/omap_intc.c | 276 --------------------------------------------
  1 file changed, 276 deletions(-)


-static const TypeInfo omap2_intc_info = {
-    .name          = "omap2-intc",
-    .parent        = TYPE_OMAP_INTC,
-    .instance_init = omap2_intc_init,
-    .class_init    = omap2_intc_class_init,
-};
-
  static const TypeInfo omap_intc_type_info = {
      .name          = TYPE_OMAP_INTC,
      .parent        = TYPE_SYS_BUS_DEVICE,
@@ -684,7 +409,6 @@ static void omap_intc_register_types(void)
  {
      type_register_static(&omap_intc_type_info);
      type_register_static(&omap_intc_info);
-    type_register_static(&omap2_intc_info);
  }
  
  type_init(omap_intc_register_types)

I'd squash in the same commit the abstract parent removal:

-- >8 --
diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
index 67bb83dff5..43a1a9ebe7 100644
--- a/include/hw/arm/omap.h
+++ b/include/hw/arm/omap.h
@@ -68,7 +68,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)

diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c
index c14b22d381..f4f5f8455b 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,
+    .name          = TYPE_OMAP_INTC,
+    .parent        = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(OMAPIntcState),
     .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,
-};
-
 static void omap_intc_register_types(void)
 {
-    type_register_static(&omap_intc_type_info);
     type_register_static(&omap_intc_info);
 }

---

But this can be done on top, so:

Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>
Tested-by: Philippe Mathieu-Daudé <phi...@linaro.org>