diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-12-15 15:41:07 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-01-08 15:13:38 +0000 |
| commit | 2d3bf6532733a07671141019f784c945e997d285 (patch) | |
| tree | f267bf81d7141fbfd842b4c07738b0e9cbf8894f | |
| parent | 729cc683735309bdcd55604be19292950877ecf5 (diff) | |
| download | focaccia-qemu-2d3bf6532733a07671141019f784c945e997d285.tar.gz focaccia-qemu-2d3bf6532733a07671141019f784c945e997d285.zip | |
target/arm: Remove timer_del()/timer_deinit() before timer_free()
The Arm CPU finalize function uses a sequence of timer_del(), timer_deinit(), timer_free() to free the timer. The timer_deinit() step in this was always unnecessary, and now the timer_del() is implied by timer_free(), so we can collapse this down to simply calling timer_free(). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20201215154107.3255-5-peter.maydell@linaro.org
| -rw-r--r-- | target/arm/cpu.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 62e319eb6a..8387e94b94 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1305,8 +1305,6 @@ static void arm_cpu_finalizefn(Object *obj) } #ifndef CONFIG_USER_ONLY if (cpu->pmu_timer) { - timer_del(cpu->pmu_timer); - timer_deinit(cpu->pmu_timer); timer_free(cpu->pmu_timer); } #endif |