diff options
| author | imp <imp@FreeBSD.org> | 2007-06-12 15:37:19 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2007-06-12 15:37:19 +0000 |
| commit | d4a700c2dc6c55dae07b6ed7fe4d47508632b9f4 (patch) | |
| tree | 0ae8c91399f156d2d3de7df83e1fc292de48873b /sys/dev/usb/udbp.c | |
| parent | d6014e5948f9129258e24ea5eed97306faafe1cb (diff) | |
| download | FreeBSD-src-d4a700c2dc6c55dae07b6ed7fe4d47508632b9f4.zip FreeBSD-src-d4a700c2dc6c55dae07b6ed7fe4d47508632b9f4.tar.gz | |
Expand USB_ATTACH_{ERROR,SUCCESS}_RETURN inline and eliminate from
usb_port.h. They aren't needed, and are a legacy of this code's past.
Diffstat (limited to 'sys/dev/usb/udbp.c')
| -rw-r--r-- | sys/dev/usb/udbp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c index fd6ecb5..a937407 100644 --- a/sys/dev/usb/udbp.c +++ b/sys/dev/usb/udbp.c @@ -270,7 +270,7 @@ USB_ATTACH(udbp) if (!ed) { printf("%s: could not read endpoint descriptor\n", device_get_nameunit(sc->sc_dev)); - USB_ATTACH_ERROR_RETURN; + return ENXIO; } if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN @@ -289,7 +289,7 @@ USB_ATTACH(udbp) if (ed_bulkin == NULL || ed_bulkout == NULL) { printf("%s: bulk-in and/or bulk-out endpoint not found\n", device_get_nameunit(sc->sc_dev)); - USB_ATTACH_ERROR_RETURN; + return ENXIO; } if (ed_bulkin->wMaxPacketSize[0] != ed_bulkout->wMaxPacketSize[0] || @@ -300,7 +300,7 @@ USB_ATTACH(udbp) ed_bulkout->wMaxPacketSize[0], ed_bulkin->wMaxPacketSize[1], ed_bulkout->wMaxPacketSize[1]); - USB_ATTACH_ERROR_RETURN; + return ENXIO; } sc->sc_bulkin = ed_bulkin->bEndpointAddress; @@ -383,7 +383,7 @@ USB_ATTACH(udbp) if (err) { goto bad; } - USB_ATTACH_SUCCESS_RETURN; + return 0; bad: #if 0 /* probably done in udbp_detach() */ if (sc->sc_bulkout_buffer) { @@ -400,7 +400,7 @@ bad: } #endif udbp_detach(self); - USB_ATTACH_ERROR_RETURN; + return ENXIO; } |
