diff options
| -rw-r--r-- | sys/dev/usb/usb_port.h | 5 | ||||
| -rw-r--r-- | sys/dev/usb/usb_subr.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/usbf_subr.c | 4 |
3 files changed, 7 insertions, 10 deletions
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index 6f10f5f1cb2..128f4191639 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_port.h,v 1.80 2007/06/11 05:42:54 mbalmer Exp $ */ +/* $OpenBSD: usb_port.h,v 1.81 2007/06/11 06:14:24 mbalmer Exp $ */ /* $NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -123,7 +123,4 @@ const struct cfattach __CONCAT(dname,_ca) = { \ #define USB_GET_SC(dname, unit, sc) \ sc = __CONCAT(dname,_cd).cd_devs[unit] -#define USB_DO_ATTACH(dev, bdev, parent, args, print, sub) \ - (config_found_sm(parent, args, print, sub)) - #endif /* _USB_PORT_H */ diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c index 85d446f9636..783a64639bc 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.54 2007/06/10 17:46:27 mbalmer Exp $ */ +/* $OpenBSD: usb_subr.c,v 1.55 2007/06/11 06:14:24 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 $ */ @@ -845,7 +845,7 @@ usbd_probe_and_attach(device_ptr_t parent, usbd_device_handle dev, int port, /* First try with device specific drivers. */ DPRINTF(("usbd_probe_and_attach: trying device specific drivers\n")); - dv = USB_DO_ATTACH(dev, bdev, parent, &uaa, usbd_print, usbd_submatch); + dv = config_found_sm(parent, &uaa, usbd_print, usbd_submatch); if (dv) { dev->subdevs = malloc(2 * sizeof dv, M_USB, M_NOWAIT); if (dev->subdevs == NULL) @@ -900,7 +900,7 @@ usbd_probe_and_attach(device_ptr_t parent, usbd_device_handle dev, int port, continue; /* interface already claimed */ uaa.iface = ifaces[i]; uaa.ifaceno = ifaces[i]->idesc->bInterfaceNumber; - dv = USB_DO_ATTACH(dev, bdev, parent, &uaa, usbd_print, + dv = config_found_sm(parent, &uaa, usbd_print, usbd_submatch); if (dv != NULL) { @@ -927,7 +927,7 @@ usbd_probe_and_attach(device_ptr_t parent, usbd_device_handle dev, int port, uaa.usegeneric = 1; uaa.configno = UHUB_UNK_CONFIGURATION; uaa.ifaceno = UHUB_UNK_INTERFACE; - dv = USB_DO_ATTACH(dev, bdev, parent, &uaa, usbd_print, usbd_submatch); + dv = config_found_sm(parent, &uaa, usbd_print, usbd_submatch); if (dv != NULL) { dev->subdevs = malloc(2 * sizeof dv, M_USB, M_NOWAIT); if (dev->subdevs == 0) diff --git a/sys/dev/usb/usbf_subr.c b/sys/dev/usb/usbf_subr.c index 68c42ce1845..0e2ca2dd776 100644 --- a/sys/dev/usb/usbf_subr.c +++ b/sys/dev/usb/usbf_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbf_subr.c,v 1.5 2007/06/10 14:49:01 mbalmer Exp $ */ +/* $OpenBSD: usbf_subr.c,v 1.6 2007/06/11 06:14:24 mbalmer Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -111,7 +111,7 @@ usbf_probe_and_attach(device_ptr_t parent, usbf_device_handle dev, int port) * be initialized in the function driver's attach routine. Also, it * should use usbf_devinfo_setup() to set the device identification. */ - dv = USB_DO_ATTACH(dev, NULL, parent, &uaa, NULL, NULL); + dv = config_found_sm(parent, &uaa, NULL, NULL); if (dv != NULL) { dev->function = (struct usbf_function *)dv; return USBF_NORMAL_COMPLETION; |