From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 02/31] xhci: s/xhci_update_port/xhci_port_update/
Date: Thu, 1 Nov 2012 16:54:15 +0100 [thread overview]
Message-ID: <1351785284-15384-3-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1351785284-15384-1-git-send-email-kraxel@redhat.com>
Rename the function for xhci_port_* naming scheme, also drop
the xhci parameter as port carries a pointer to xhci anyway.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/usb/hcd-xhci.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index c062330..f5ab692 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -2337,7 +2337,7 @@ static void xhci_process_commands(XHCIState *xhci)
}
}
-static void xhci_update_port(XHCIState *xhci, XHCIPort *port, int is_detach)
+static void xhci_port_update(XHCIPort *port, int is_detach)
{
port->portsc = PORTSC_PP;
if (port->uport->dev && port->uport->dev->attached && !is_detach &&
@@ -2363,7 +2363,7 @@ static void xhci_update_port(XHCIState *xhci, XHCIPort *port, int is_detach)
port->portsc |= PORTSC_CSC;
XHCIEvent ev = { ER_PORT_STATUS_CHANGE, CC_SUCCESS,
port->portnr << 24};
- xhci_event(xhci, &ev, 0);
+ xhci_event(port->xhci, &ev, 0);
DPRINTF("xhci: port change event for port %d\n", port->portnr);
}
}
@@ -2393,7 +2393,7 @@ static void xhci_reset(DeviceState *dev)
}
for (i = 0; i < xhci->numports; i++) {
- xhci_update_port(xhci->ports + i, 0);
+ xhci_port_update(xhci->ports + i, 0);
}
for (i = 0; i < xhci->numintrs; i++) {
@@ -2840,7 +2840,7 @@ static void xhci_attach(USBPort *usbport)
XHCIState *xhci = usbport->opaque;
XHCIPort *port = xhci_lookup_port(xhci, usbport);
- xhci_update_port(xhci, port, 0);
+ xhci_port_update(port, 0);
}
static void xhci_detach(USBPort *usbport)
@@ -2848,7 +2848,7 @@ static void xhci_detach(USBPort *usbport)
XHCIState *xhci = usbport->opaque;
XHCIPort *port = xhci_lookup_port(xhci, usbport);
- xhci_update_port(xhci, port, 1);
+ xhci_port_update(port, 1);
}
static void xhci_wakeup(USBPort *usbport)
--
1.7.1
next prev parent reply other threads:[~2012-11-01 15:54 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-01 15:54 [Qemu-devel] [PULL 00/31] usb patch queue Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 01/31] xhci: add {get, set}_field macros & enum for pls Gerd Hoffmann
2012-11-01 15:54 ` Gerd Hoffmann [this message]
2012-11-01 15:54 ` [Qemu-devel] [PATCH 03/31] xhci: add xhci_port_have_device Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 04/31] xhci: add xhci_port_notify Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 05/31] xhci: add xhci_port_reset Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 06/31] xhci: set pls in xhci_port_update & xhci_port_reset Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 07/31] xhci: add port trace points Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 08/31] xhci: allow address slot being called multiple times Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 09/31] usb/ehci: parameterise the register region offsets Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 10/31] usb/ehci: Abstract away PCI DMA API Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 11/31] usb/ehci: seperate out PCIisms Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 12/31] usb/ehci: Guard definition of EHCI_DEBUG Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 13/31] usb/ehci: split into multiple source files Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 14/31] usb/ehci: add sysbus variant Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 15/31] xilinx_zynq: add USB controllers Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 16/31] uhci: dynamic type generation Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 17/31] uhci: stick irq routing info into UHCIInfo too Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 18/31] uhci: add ich9 00:1a.* variants Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 19/31] usb/ehci-pci: dynamic type generation Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 20/31] usb/ehci-pci: add ich9 00:1a.* variant Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 21/31] usb/ehci-pci: add helper to create ich9 usb controllers Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 22/31] uhci: Add a uhci_handle_td_error() helper function Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 23/31] uhci: Don't crash on device disconnect Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 24/31] usb: Add packet combining functions Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 25/31] combined-packet: Add a workaround for Linux usbfs + live migration Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 26/31] usb-redir: Add support for 32 bits bulk packet length Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 27/31] usb-redir: Add support for input pipelining Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 28/31] usb-redir: Add an usbredir_setup_usb_eps() helper function Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 29/31] usb-redir: Use reject rather the disconnect on bad ep info Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 30/31] usb-redir: Allow to attach USB 2.0 devices to 1.1 host controller Gerd Hoffmann
2012-11-01 15:54 ` [Qemu-devel] [PATCH 31/31] usb-redir: Allow redirecting super speed devices to high speed controllers Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351785284-15384-3-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).