diff options
| author | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-06-10 17:46:28 +0000 |
|---|---|---|
| committer | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-06-10 17:46:28 +0000 |
| commit | 6d81e40a10cdca42ea68ce7111a2caaa60f7f185 (patch) | |
| tree | 56c000163fa0fe63df31ea1445f2f97eb62fbbc0 /sys/dev/usb/usb_subr.c | |
| parent | eca662797b306fe6394bf09e596f4184f133c3d5 (diff) | |
Get rid of the USBDEVPTRNAME macro.
No binary change.
ok jsg.
Diffstat (limited to 'sys/dev/usb/usb_subr.c')
| -rw-r--r-- | sys/dev/usb/usb_subr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index 5c220c5091f..85d446f9636 100644 --- a/sys/dev/usb/usb_subr.c +++ b/sys/dev/usb/usb_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_subr.c,v 1.53 2007/06/10 15:33:16 mbalmer Exp $ */ +/* $OpenBSD: usb_subr.c,v 1.54 2007/06/10 17:46:27 mbalmer Exp $ */ /* $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -867,11 +867,11 @@ usbd_probe_and_attach(device_ptr_t parent, usbd_device_handle dev, int port, if (err) { #ifdef USB_DEBUG DPRINTF(("%s: port %d, set config at addr %d failed, " - "error=%s\n", USBDEVPTRNAME(parent), port, + "error=%s\n", parent->dv_xname, port, addr, usbd_errstr(err))); #else printf("%s: port %d, set config at addr %d failed\n", - USBDEVPTRNAME(parent), port, addr); + parent->dv_xname, port, addr); #endif return (err); @@ -1263,7 +1263,7 @@ usbd_fill_deviceinfo(usbd_device_handle dev, struct usb_device_info *di, if (dev->subdevs != NULL) { for (i = 0; dev->subdevs[i] && i < USB_MAX_DEVNAMES; i++) { strncpy(di->udi_devnames[i], - USBDEVPTRNAME(dev->subdevs[i]), USB_MAX_DEVNAMELEN); + dev->subdevs[i]->dv_xname, USB_MAX_DEVNAMELEN); di->udi_devnames[i][USB_MAX_DEVNAMELEN-1] = '\0'; } } else @@ -1338,7 +1338,7 @@ void usb_disconnect_port(struct usbd_port *up, device_ptr_t parent) { usbd_device_handle dev = up->device; - char *hubname = USBDEVPTRNAME(parent); + char *hubname = parent->dv_xname; int i; DPRINTFN(3,("uhub_disconnect: up=%p dev=%p port=%d\n", @@ -1354,7 +1354,7 @@ usb_disconnect_port(struct usbd_port *up, device_ptr_t parent) if (dev->subdevs != NULL) { DPRINTFN(3,("usb_disconnect_port: disconnect subdevs\n")); for (i = 0; dev->subdevs[i]; i++) { - printf("%s: at %s", USBDEVPTRNAME(dev->subdevs[i]), + printf("%s: at %s", dev->subdevs[i]->dv_xname, hubname); if (up->portno != 0) printf(" port %d", up->portno); |