[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 32/32] usb: zap pdev from usbport
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v4 32/32] usb: zap pdev from usbport |
Date: |
Wed, 12 Jan 2011 12:20:14 +0100 |
It isn't needed any more.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb-bus.c | 3 +--
hw/usb-hub.c | 2 +-
hw/usb-musb.c | 2 +-
hw/usb-ohci.c | 2 +-
hw/usb-uhci.c | 2 +-
hw/usb.h | 3 +--
6 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/hw/usb-bus.c b/hw/usb-bus.c
index f89176b..6e2e5fd 100644
--- a/hw/usb-bus.c
+++ b/hw/usb-bus.c
@@ -120,11 +120,10 @@ USBDevice *usb_create_simple(USBBus *bus, const char
*name)
}
void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index,
- USBDevice *pdev, USBPortOps *ops, int speedmask)
+ USBPortOps *ops, int speedmask)
{
port->opaque = opaque;
port->index = index;
- port->pdev = pdev;
port->opaque = opaque;
port->index = index;
port->ops = ops;
diff --git a/hw/usb-hub.c b/hw/usb-hub.c
index 387c40c..78698ca 100644
--- a/hw/usb-hub.c
+++ b/hw/usb-hub.c
@@ -536,7 +536,7 @@ static int usb_hub_initfn(USBDevice *dev)
for (i = 0; i < NUM_PORTS; i++) {
port = &s->ports[i];
usb_register_port(usb_bus_from_device(dev),
- &port->port, s, i, &s->dev, &usb_hub_port_ops,
+ &port->port, s, i, &usb_hub_port_ops,
USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL);
port->wPortStatus = PORT_STAT_POWER;
port->wPortChange = 0;
diff --git a/hw/usb-musb.c b/hw/usb-musb.c
index 4b5f35b..782cfa2 100644
--- a/hw/usb-musb.c
+++ b/hw/usb-musb.c
@@ -349,7 +349,7 @@ struct MUSBState {
}
usb_bus_new(&s->bus, NULL /* FIXME */);
- usb_register_port(&s->bus, &s->port, s, 0, NULL, &musb_port_ops,
+ usb_register_port(&s->bus, &s->port, s, 0, &musb_port_ops,
USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL);
usb_port_location(&s->port, NULL, 1);
diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
index 6344f81..09ea0b6 100644
--- a/hw/usb-ohci.c
+++ b/hw/usb-ohci.c
@@ -1699,7 +1699,7 @@ static void usb_ohci_init(OHCIState *ohci, DeviceState
*dev,
usb_bus_new(&ohci->bus, dev);
ohci->num_ports = num_ports;
for (i = 0; i < num_ports; i++) {
- usb_register_port(&ohci->bus, &ohci->rhport[i].port, ohci, i, NULL,
&ohci_port_ops,
+ usb_register_port(&ohci->bus, &ohci->rhport[i].port, ohci, i,
&ohci_port_ops,
USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL);
usb_port_location(&ohci->rhport[i].port, NULL, i+1);
}
diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index 6db1960..b384e1d 100644
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -1129,7 +1129,7 @@ static int usb_uhci_common_initfn(UHCIState *s)
usb_bus_new(&s->bus, &s->dev.qdev);
for(i = 0; i < NB_PORTS; i++) {
- usb_register_port(&s->bus, &s->ports[i].port, s, i, NULL,
&uhci_port_ops,
+ usb_register_port(&s->bus, &s->ports[i].port, s, i, &uhci_port_ops,
USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL);
usb_port_location(&s->ports[i].port, NULL, i+1);
}
diff --git a/hw/usb.h b/hw/usb.h
index c6e3e25..5c1da3e 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -244,7 +244,6 @@ struct USBPort {
char path[16];
USBPortOps *ops;
void *opaque;
- USBDevice *pdev;
int index; /* internal port index, may be used with the opaque */
QTAILQ_ENTRY(USBPort) next;
};
@@ -355,7 +354,7 @@ USBDevice *usb_create(USBBus *bus, const char *name);
USBDevice *usb_create_simple(USBBus *bus, const char *name);
USBDevice *usbdevice_create(const char *cmdline);
void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index,
- USBDevice *pdev, USBPortOps *ops, int speedmask);
+ USBPortOps *ops, int speedmask);
void usb_port_location(USBPort *downstream, USBPort *upstream, int portnr);
void usb_unregister_port(USBBus *bus, USBPort *port);
int usb_device_attach(USBDevice *dev);
--
1.7.1
- [Qemu-devel] [PATCH v4 23/32] usb: add attach callback, (continued)
- [Qemu-devel] [PATCH v4 23/32] usb: add attach callback, Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 15/32] usb: create USBPortOps, move attach there., Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 20/32] usb: hid: remote wakeup support., Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 18/32] usb: uhci: remote wakeup support., Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 17/32] usb: add usb_wakeup() + wakeup callback to port ops, Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 31/32] usb: rewrite fw path, fix numbering, Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 24/32] usb: add usb_desc_attach, Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 22/32] usb: add speed mask to ports, Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 32/32] usb: zap pdev from usbport,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v4 27/32] usb storage: fix status reporting, Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 28/32] usb storage: handle long responses, Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 16/32] usb: rework attach/detach workflow, Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 25/32] usb: add device qualifier support, Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 26/32] usb storage: high speed support, Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 29/32] usb: keep track of physical port address., Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 30/32] usb: add port property., Gerd Hoffmann, 2011/01/12
- [Qemu-devel] [PATCH v4 13/32] usb: move USB_REQ_{GET, SET}_CONFIGURATION handling to common code, Gerd Hoffmann, 2011/01/12
- [Qemu-devel] Re: [PATCH v4 00/32] usb descriptor overhaul + more, Gerd Hoffmann, 2011/01/21