aboutsummaryrefslogtreecommitdiff
path: root/hw/sd
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-12-15 15:41:06 +0000
committerPeter Maydell <peter.maydell@linaro.org>2021-01-08 15:13:38 +0000
commit729cc683735309bdcd55604be19292950877ecf5 (patch)
tree1526e51aa0a38f97a5950bc549472aefd58c19c8 /hw/sd
parent01b3e68bb18d1a37f013ffac41423faa7c00958f (diff)
downloadqemu-729cc683735309bdcd55604be19292950877ecf5.zip
qemu-729cc683735309bdcd55604be19292950877ecf5.tar.gz
qemu-729cc683735309bdcd55604be19292950877ecf5.tar.bz2
Remove superfluous timer_del() calls
This commit is the result of running the timer-del-timer-free.cocci script on the whole source tree. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Acked-by: Corey Minyard <cminyard@mvista.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20201215154107.3255-4-peter.maydell@linaro.org
Diffstat (limited to 'hw/sd')
-rw-r--r--hw/sd/sd.c1
-rw-r--r--hw/sd/sdhci.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 2aeab39..4375ed5 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -2133,7 +2133,6 @@ static void sd_instance_finalize(Object *obj)
{
SDState *sd = SD_CARD(obj);
- timer_del(sd->ocr_power_timer);
timer_free(sd->ocr_power_timer);
}
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 2f8b74a..8ffa539 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1330,9 +1330,7 @@ void sdhci_initfn(SDHCIState *s)
void sdhci_uninitfn(SDHCIState *s)
{
- timer_del(s->insert_timer);
timer_free(s->insert_timer);
- timer_del(s->transfer_timer);
timer_free(s->transfer_timer);
g_free(s->fifo_buffer);