Message ID | 20191219185127.24388-7-f4bug@amsat.org |
---|---|
State | New |
Headers | show |
Series | [01/13] hw/timer/allwinner: Use the AW_A10_PIT_TIMER_NR definition | expand |
diff --git a/include/hw/timer/allwinner-a10-pit.h b/include/hw/timer/allwinner-a10-pit.h index a60b9f3031..b5ac6898fa 100644 --- a/include/hw/timer/allwinner-a10-pit.h +++ b/include/hw/timer/allwinner-a10-pit.h @@ -21,7 +21,7 @@ struct AwA10PITState { /*< public >*/ qemu_irq irq[AW_PIT_TIMER_MAX]; ptimer_state * ptimer[AW_PIT_TIMER_MAX]; - AwA10TimerContext timer_context[AW_PIT_TIMER_MAX]; + AwA10TimerContext timer[AW_PIT_TIMER_MAX]; MemoryRegion iomem; uint32_t clk_freq[4]; diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index effdf91344..44e6eee3a8 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -301,7 +301,7 @@ static void a10_pit_init(Object *obj) sysbus_init_mmio(sbd, &s->iomem); for (i = 0; i < AW_A10_PIT_TIMER_NR; i++) { - AwA10TimerContext *tc = &s->timer_context[i]; + AwA10TimerContext *tc = &s->timer[i]; tc->container = s; tc->index = i;
The previous 'timer' field has been renamed as 'ptimer'. The 'timer_context' can now be simplified as 'timer'. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- include/hw/timer/allwinner-a10-pit.h | 2 +- hw/timer/allwinner-a10-pit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)