OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

usb/ohci: Merge ohci_async_cancel_device() into ohci_child_detach()

Browse Source 
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 <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <5fc8ba0bbf55703014d22dd06ab2f9eabaf370bf.1643117600.git.balaton@eik.bme.hu>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
BALATON Zoltan 2022-01-25 14:33:20 +01:00 committed by Gerd Hoffmann
parent 37bf0654b8
commit b6b0c066f5
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/usb/hcd-ohci.c
View File

@ -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 && if (ohci->async_td &&
usb_packet_is_inflight(&ohci->usb_packet) && usb_packet_is_inflight(&ohci->usb_packet) &&
ohci->usb_packet.ep->dev == dev) { 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) static void ohci_detach(USBPort *port1)
{ {
OHCIState *s = port1->opaque; OHCIState *s = port1->opaque;
OHCIPort *port = &s->rhport[port1->index]; OHCIPort *port = &s->rhport[port1->index];
uint32_t old_state = port->ctrl; uint32_t old_state = port->ctrl;
ohci_async_cancel_device(s, port1->dev); ohci_child_detach(port1, port1->dev);
/* set connect status */ /* set connect status */
if (port->ctrl & OHCI_PORT_CCS) { if (port->ctrl & OHCI_PORT_CCS) {