diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-12-15 15:41:06 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-01-08 15:13:38 +0000 |
| commit | 729cc683735309bdcd55604be19292950877ecf5 (patch) | |
| tree | 1526e51aa0a38f97a5950bc549472aefd58c19c8 /hw/usb | |
| parent | 01b3e68bb18d1a37f013ffac41423faa7c00958f (diff) | |
| download | qemu-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/usb')
| -rw-r--r-- | hw/usb/dev-hub.c | 1 | ||||
| -rw-r--r-- | hw/usb/hcd-ehci.c | 1 | ||||
| -rw-r--r-- | hw/usb/hcd-ohci-pci.c | 1 | ||||
| -rw-r--r-- | hw/usb/hcd-uhci.c | 1 | ||||
| -rw-r--r-- | hw/usb/hcd-xhci.c | 1 | ||||
| -rw-r--r-- | hw/usb/redirect.c | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c index 40c1f90..e35813d 100644 --- a/hw/usb/dev-hub.c +++ b/hw/usb/dev-hub.c @@ -576,7 +576,6 @@ static void usb_hub_unrealize(USBDevice *dev) &s->ports[i].port); } - timer_del(s->port_timer); timer_free(s->port_timer); } diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index ae7f20c..aca018d 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -2534,7 +2534,6 @@ void usb_ehci_unrealize(EHCIState *s, DeviceState *dev) trace_usb_ehci_unrealize(); if (s->frame_timer) { - timer_del(s->frame_timer); timer_free(s->frame_timer); s->frame_timer = NULL; } diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c index f95199e..8e1146b 100644 --- a/hw/usb/hcd-ohci-pci.c +++ b/hw/usb/hcd-ohci-pci.c @@ -97,7 +97,6 @@ static void usb_ohci_exit(PCIDevice *dev) usb_bus_release(&s->bus); } - timer_del(s->eof_timer); timer_free(s->eof_timer); } diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 27ca237..5969eb8 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -1283,7 +1283,6 @@ static void usb_uhci_exit(PCIDevice *dev) trace_usb_uhci_exit(); if (s->frame_timer) { - timer_del(s->frame_timer); timer_free(s->frame_timer); s->frame_timer = NULL; } diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 9ce7ca7..46212b1 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3395,7 +3395,6 @@ static void usb_xhci_unrealize(DeviceState *dev) } if (xhci->mfwrap_timer) { - timer_del(xhci->mfwrap_timer); timer_free(xhci->mfwrap_timer); xhci->mfwrap_timer = NULL; } diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 03b6f61..7e9e3fe 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1481,7 +1481,6 @@ static void usbredir_unrealize(USBDevice *udev) qemu_bh_delete(dev->chardev_close_bh); qemu_bh_delete(dev->device_reject_bh); - timer_del(dev->attach_timer); timer_free(dev->attach_timer); usbredir_cleanup_device_queues(dev); |