[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/10] usb: remove usb_bus_find
From: |
Paolo Bonzini |
Subject: |
[PATCH 08/10] usb: remove usb_bus_find |
Date: |
Fri, 23 Feb 2024 13:44:04 +0100 |
Inline the sole remaining use, which is for the -usbdevice command line.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/hw/usb.h | 1 -
hw/usb/bus.c | 15 +--------------
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/include/hw/usb.h b/include/hw/usb.h
index cfeead28403..d46d96779ad 100644
--- a/include/hw/usb.h
+++ b/include/hw/usb.h
@@ -498,7 +498,6 @@ struct USBBusOps {
void usb_bus_new(USBBus *bus, size_t bus_size,
USBBusOps *ops, DeviceState *host);
void usb_bus_release(USBBus *bus);
-USBBus *usb_bus_find(int busnr);
void usb_legacy_register(const char *typename, const char *usbdevice_name,
USBDevice *(*usbdevice_init)(void));
USBDevice *usbdevice_create(const char *cmdline);
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 76fda41b7ec..796769fadb4 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -100,19 +100,6 @@ void usb_bus_release(USBBus *bus)
QTAILQ_REMOVE(&busses, bus, next);
}
-USBBus *usb_bus_find(int busnr)
-{
- USBBus *bus;
-
- if (-1 == busnr)
- return QTAILQ_FIRST(&busses);
- QTAILQ_FOREACH(bus, &busses, next) {
- if (bus->busnr == busnr)
- return bus;
- }
- return NULL;
-}
-
static void usb_device_realize(USBDevice *dev, Error **errp)
{
USBDeviceClass *klass = USB_DEVICE_GET_CLASS(dev);
@@ -643,7 +630,7 @@ HumanReadableText *qmp_x_query_usb(Error **errp)
/* handle legacy -usbdevice cmd line option */
USBDevice *usbdevice_create(const char *driver)
{
- USBBus *bus = usb_bus_find(-1 /* any */);
+ USBBus *bus = QTAILQ_FIRST(&busses);
LegacyUSBFactory *f = NULL;
Error *err = NULL;
GSList *i;
--
2.43.0
- Re: [PATCH 03/10] sh4: r2d: do not use usb_bus_find(), (continued)
- [PATCH 01/10] acpi, qom: move object_resolve_type_unambiguous to core QOM, Paolo Bonzini, 2024/02/23
- [PATCH 07/10] pseries: do not require CONFIG_USB, Paolo Bonzini, 2024/02/23
- [PATCH 09/10] usb: extract sysbus-ohci to a separate file, Paolo Bonzini, 2024/02/23
- [PATCH 08/10] usb: remove usb_bus_find,
Paolo Bonzini <=
- [PATCH 06/10] mac_newworld: do not require CONFIG_USB, Paolo Bonzini, 2024/02/23
- [PATCH 05/10] hppa: do not require CONFIG_USB, Paolo Bonzini, 2024/02/23
- [PATCH 10/10] usb: remove duplicate file in system_ss, Paolo Bonzini, 2024/02/23