diff options
| author | Warner Losh <imp@FreeBSD.org> | 2007-06-12 15:37:19 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2007-06-12 15:37:19 +0000 |
| commit | 645016c0e428f5acb73007eb3c79ab0aee92ffa5 (patch) | |
| tree | 0ae8c91399f156d2d3de7df83e1fc292de48873b /sys/dev/usb/ukbd.c | |
| parent | e141ee255d293ca8ec36b2567fd4cdf56443116f (diff) | |
| download | src-645016c0e428f5acb73007eb3c79ab0aee92ffa5.tar.gz src-645016c0e428f5acb73007eb3c79ab0aee92ffa5.zip | |
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.
Notes
Notes:
svn path=/head/; revision=170612
Diffstat (limited to 'sys/dev/usb/ukbd.c')
| -rw-r--r-- | sys/dev/usb/ukbd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index 7898c508a52d..d8277406fc6d 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -163,7 +163,7 @@ USB_ATTACH(ukbd) sc->sc_dev = self; sw = kbd_get_switch(DRIVER_NAME); if (sw == NULL) - USB_ATTACH_ERROR_RETURN; + return ENXIO; id = usbd_get_interface_descriptor(iface); @@ -171,19 +171,19 @@ USB_ATTACH(ukbd) arg[1] = (void *)ukbd_intr; kbd = NULL; if ((*sw->probe)(unit, (void *)arg, 0)) - USB_ATTACH_ERROR_RETURN; + return ENXIO; if ((*sw->init)(unit, &kbd, (void *)arg, 0)) - USB_ATTACH_ERROR_RETURN; + return ENXIO; (*sw->enable)(kbd); #ifdef KBD_INSTALL_CDEV if (kbd_attach(kbd)) - USB_ATTACH_ERROR_RETURN; + return ENXIO; #endif if (bootverbose) (*sw->diag)(kbd, bootverbose); - USB_ATTACH_SUCCESS_RETURN; + return 0; } int |