From: BALATON Zoltan Date: Tue, 25 Jan 2022 13:33:20 +0000 (+0100) Subject: usb/ohci: Merge ohci_async_cancel_device() into ohci_child_detach() X-Git-Tag: v7.0.0-rc0~28^2~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6b0c066f5750c3c977b647509f225ba06038b60;p=thirdparty%2Fqemu.git usb/ohci: Merge ohci_async_cancel_device() into ohci_child_detach() These two do the same and only used once so no need to have two functions, simplify by merging them. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé Message-Id: <5fc8ba0bbf55703014d22dd06ab2f9eabaf370bf.1643117600.git.balaton@eik.bme.hu> Signed-off-by: Gerd Hoffmann --- diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 190f5a8aba1..09d07367cc0 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -1725,8 +1725,10 @@ static void ohci_attach(USBPort *port1) } } -static void ohci_async_cancel_device(OHCIState *ohci, USBDevice *dev) +static void ohci_child_detach(USBPort *port1, USBDevice *dev) { + OHCIState *ohci = port1->opaque; + if (ohci->async_td && usb_packet_is_inflight(&ohci->usb_packet) && ohci->usb_packet.ep->dev == dev) { @@ -1735,20 +1737,13 @@ static void ohci_async_cancel_device(OHCIState *ohci, USBDevice *dev) } } -static void ohci_child_detach(USBPort *port1, USBDevice *child) -{ - OHCIState *s = port1->opaque; - - ohci_async_cancel_device(s, child); -} - static void ohci_detach(USBPort *port1) { OHCIState *s = port1->opaque; OHCIPort *port = &s->rhport[port1->index]; uint32_t old_state = port->ctrl; - ohci_async_cancel_device(s, port1->dev); + ohci_child_detach(port1, port1->dev); /* set connect status */ if (port->ctrl & OHCI_PORT_CCS) {