mbox series

[00/14] hw/arm: QOM OBJECT_DECLARE_SIMPLE_TYPE cleanups

Message ID 20230109140306.23161-1-philmd@linaro.org
Headers show
Series hw/arm: QOM OBJECT_DECLARE_SIMPLE_TYPE cleanups | expand

Message

Philippe Mathieu-Daudé Jan. 9, 2023, 2:02 p.m. UTC
These patches certainly look as churn, but they are required to
be able to update the OBJECT_DECLARE_SIMPLE_TYPE() macro...

Except the OMAP related files, the rest seems to have been
merged shortly after automatic script conversion from commit
8063396bf3 ("Use OBJECT_DECLARE_SIMPLE_TYPE when possible")
was run, so missed the QOM cleanup.

So here we go with yet another boring cleanup series.

Philippe Mathieu-Daudé (14):
  hw/arm/pxa: Avoid forward-declaring PXA2xxI2CState
  hw/gpio/omap_gpio: Add local variable to avoid embedded cast
  hw/arm/omap: Drop useless casts from void * to pointer
  hw/gpio/omap_gpio: Use CamelCase for TYPE_OMAP1_GPIO type name
  hw/gpio/omap_gpio: Use CamelCase for TYPE_OMAP2_GPIO type name
  hw/intc/omap_intc: Use CamelCase for TYPE_OMAP_INTC type name
  hw/arm/stellaris: Drop useless casts from void * to pointer
  hw/arm/stellaris: Use CamelCase for STELLARIS_ADC type name
  hw/arm/bcm2836: Remove definitions generated by OBJECT_DECLARE_TYPE()
  hw/arm/npcm7xx: Declare QOM macros using OBJECT_DECLARE_SIMPLE_TYPE()
  hw/misc/sbsa_ec: Rename TYPE_SBSA_EC -> TYPE_SBSA_SECURE_EC
  hw/misc/sbsa_ec: Declare QOM macros using OBJECT_DECLARE_SIMPLE_TYPE()
  hw/intc/xilinx_intc: Use 'XpsIntc' typedef instead of 'struct xlx_pic'
  hw/timer/xilinx_timer: Use XpsTimerState instead of 'struct
    timerblock'

 hw/arm/bcm2836.c               |   9 +--
 hw/arm/omap1.c                 | 115 ++++++++++++++++-----------------
 hw/arm/omap2.c                 |  40 ++++++------
 hw/arm/omap_sx1.c              |   2 +-
 hw/arm/palm.c                  |   2 +-
 hw/arm/stellaris.c             |  73 +++++++++++----------
 hw/char/omap_uart.c            |   7 +-
 hw/display/omap_dss.c          |  15 ++---
 hw/display/omap_lcdc.c         |   9 ++-
 hw/dma/omap_dma.c              |  15 ++---
 hw/gpio/omap_gpio.c            |  48 +++++++-------
 hw/intc/omap_intc.c            |  38 +++++------
 hw/intc/xilinx_intc.c          |  28 ++++----
 hw/misc/omap_gpmc.c            |  12 ++--
 hw/misc/omap_l4.c              |   7 +-
 hw/misc/omap_sdrc.c            |   7 +-
 hw/misc/omap_tap.c             |   5 +-
 hw/misc/sbsa_ec.c              |  12 ++--
 hw/sd/omap_mmc.c               |   9 ++-
 hw/ssi/omap_spi.c              |   7 +-
 hw/timer/omap_gptimer.c        |  22 +++----
 hw/timer/omap_synctimer.c      |   4 +-
 hw/timer/xilinx_timer.c        |  27 ++++----
 include/hw/adc/npcm7xx_adc.h   |   7 +-
 include/hw/arm/npcm7xx.h       |  18 ++----
 include/hw/arm/omap.h          |  24 ++++---
 include/hw/arm/pxa.h           |   6 +-
 include/hw/i2c/npcm7xx_smbus.h |   7 +-
 include/hw/misc/npcm7xx_clk.h  |   2 +-
 include/hw/misc/npcm7xx_gcr.h  |   6 +-
 include/hw/misc/npcm7xx_mft.h  |   7 +-
 include/hw/misc/npcm7xx_pwm.h  |   3 +-
 include/hw/misc/npcm7xx_rng.h  |   6 +-
 include/hw/net/npcm7xx_emc.h   |   5 +-
 include/hw/sd/npcm7xx_sdhci.h  |   4 +-
 35 files changed, 282 insertions(+), 326 deletions(-)

Comments

Richard Henderson Jan. 9, 2023, 5:59 p.m. UTC | #1
On 1/9/23 06:02, Philippe Mathieu-Daudé wrote:
> Philippe Mathieu-Daudé (14):
>    hw/arm/pxa: Avoid forward-declaring PXA2xxI2CState
>    hw/gpio/omap_gpio: Add local variable to avoid embedded cast
>    hw/arm/omap: Drop useless casts from void * to pointer
>    hw/gpio/omap_gpio: Use CamelCase for TYPE_OMAP1_GPIO type name
>    hw/gpio/omap_gpio: Use CamelCase for TYPE_OMAP2_GPIO type name
>    hw/intc/omap_intc: Use CamelCase for TYPE_OMAP_INTC type name
>    hw/arm/stellaris: Drop useless casts from void * to pointer
>    hw/arm/stellaris: Use CamelCase for STELLARIS_ADC type name
>    hw/arm/bcm2836: Remove definitions generated by OBJECT_DECLARE_TYPE()
>    hw/arm/npcm7xx: Declare QOM macros using OBJECT_DECLARE_SIMPLE_TYPE()
>    hw/misc/sbsa_ec: Rename TYPE_SBSA_EC -> TYPE_SBSA_SECURE_EC
>    hw/misc/sbsa_ec: Declare QOM macros using OBJECT_DECLARE_SIMPLE_TYPE()
>    hw/intc/xilinx_intc: Use 'XpsIntc' typedef instead of 'struct xlx_pic'
>    hw/timer/xilinx_timer: Use XpsTimerState instead of 'struct
>      timerblock'

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~
Peter Maydell Jan. 12, 2023, 5:16 p.m. UTC | #2
On Mon, 9 Jan 2023 at 14:03, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> These patches certainly look as churn, but they are required to
> be able to update the OBJECT_DECLARE_SIMPLE_TYPE() macro...
>
> Except the OMAP related files, the rest seems to have been
> merged shortly after automatic script conversion from commit
> 8063396bf3 ("Use OBJECT_DECLARE_SIMPLE_TYPE when possible")
> was run, so missed the QOM cleanup.
>
> So here we go with yet another boring cleanup series.
>



Applied to target-arm.next, thanks.

-- PMM