diff options
| author | imp <imp@FreeBSD.org> | 2007-06-12 16:52:07 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2007-06-12 16:52:07 +0000 |
| commit | e834ae963f8522bce24ae081eba547b68f85ded1 (patch) | |
| tree | 396db1f2e448e6e195fd08a0ede25fb41109414c /sys/dev/usb/uhub.c | |
| parent | fc9cb03e61e12e2da0f587a3fdccfdd9367dda86 (diff) | |
| download | FreeBSD-src-e834ae963f8522bce24ae081eba547b68f85ded1.zip FreeBSD-src-e834ae963f8522bce24ae081eba547b68f85ded1.tar.gz | |
Remove USBDEV() macro. We do not need a macro that is defined as its
only argument. It was used inconsistently in the tree, so remove it.
Diffstat (limited to 'sys/dev/usb/uhub.c')
| -rw-r--r-- | sys/dev/usb/uhub.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c index 02c252f..79749d5 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -269,7 +269,7 @@ uhub_attach(device_t self) /* Wait with power off for a while. */ usbd_delay_ms(dev, USB_POWER_DOWN_TIME); - usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, dev, USBDEV(sc->sc_dev)); + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, dev, sc->sc_dev); /* * To have the best chance of success we do things in the exact same @@ -440,7 +440,7 @@ uhub_explore(usbd_device_handle dev) /* Disconnected */ DPRINTF(("uhub_explore: device addr=%d disappeared " "on port %d\n", up->device->address, port)); - usb_disconnect_port(up, USBDEV(sc->sc_dev)); + usb_disconnect_port(up, sc->sc_dev); usbd_clear_port_feature(dev, port, UHF_C_PORT_CONNECTION); } @@ -501,7 +501,7 @@ uhub_explore(usbd_device_handle dev) else speed = USB_SPEED_FULL; /* Get device info and set its address. */ - err = usbd_new_device(USBDEV(sc->sc_dev), dev->bus, + err = usbd_new_device(sc->sc_dev, dev->bus, dev->depth + 1, speed, port, up); /* XXX retry a few times? */ if (err) { @@ -555,8 +555,7 @@ USB_DETACH(uhub) usb_disconnect_port(rup, self); } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_hub, - USBDEV(sc->sc_dev)); + usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_hub, sc->sc_dev); if (hub->ports[0].tt) free(hub->ports[0].tt, M_USBDEV); |
