[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 3/4] usb/ohci: Merge ohci_async_cancel_device() into ohci_chi
From: |
BALATON Zoltan |
Subject: |
[RFC PATCH 3/4] usb/ohci: Merge ohci_async_cancel_device() into ohci_child_detach() |
Date: |
Fri, 01 Oct 2021 23:11:10 +0200 |
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>
---
hw/usb/hcd-ohci.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index f8761370e3..212d0aabbe 100644
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -1719,8 +1719,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) {
@@ -1729,20 +1731,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) {
--
2.21.4
- [RFC PATCH 0/4] Misc OHCI patches, BALATON Zoltan, 2021/10/01
- [RFC PATCH 4/4] usb/ohci: Don't use packet from OHCIState for isochronous transfers, BALATON Zoltan, 2021/10/01
- [RFC PATCH 1/4] usb/ohci: Move cancelling async packet to ohci_stop_endpoints(), BALATON Zoltan, 2021/10/01
- [RFC PATCH 2/4] usb/ohci: Move USBPortOps related functions together, BALATON Zoltan, 2021/10/01
- [RFC PATCH 3/4] usb/ohci: Merge ohci_async_cancel_device() into ohci_child_detach(),
BALATON Zoltan <=
- Re: [RFC PATCH 0/4] Misc OHCI patches, Howard Spoelstra, 2021/10/02
- Re: [RFC PATCH 0/4] Misc OHCI patches, BALATON Zoltan, 2021/10/02
- Re: [RFC PATCH 0/4] Misc OHCI patches, BALATON Zoltan, 2021/10/02
- Re: [RFC PATCH 0/4] Misc OHCI patches, Howard Spoelstra, 2021/10/03
- Re: [RFC PATCH 0/4] Misc OHCI patches, BALATON Zoltan, 2021/10/03
- Re: [RFC PATCH 0/4] Misc OHCI patches, Howard Spoelstra, 2021/10/03
- Re: [RFC PATCH 0/4] Misc OHCI patches, Howard Spoelstra, 2021/10/04
- Re: [RFC PATCH 0/4] Misc OHCI patches, BALATON Zoltan, 2021/10/04
Re: [RFC PATCH 0/4] Misc OHCI patches, BALATON Zoltan, 2021/10/02