diff options
| author | hselasky <hselasky@FreeBSD.org> | 2013-02-05 13:30:07 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2013-02-05 13:30:07 +0000 |
| commit | 44b21d3825c0d4faf0e12c6e7e2e0eff88397f47 (patch) | |
| tree | 6b6c71868c6619b40026751dab88ff19e1bd206c | |
| parent | 7dec4a95038f38871867b747e711cea945746647 (diff) | |
| download | FreeBSD-src-44b21d3825c0d4faf0e12c6e7e2e0eff88397f47.zip FreeBSD-src-44b21d3825c0d4faf0e12c6e7e2e0eff88397f47.tar.gz | |
Fix some nits.
| -rw-r--r-- | sys/dev/usb/usb_bus.h | 2 | ||||
| -rw-r--r-- | sys/dev/usb/usb_dynamic.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/usb_msctest.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/usb_process.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/usb_request.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/usb_bus.h b/sys/dev/usb/usb_bus.h index 07207cf..95c1632 100644 --- a/sys/dev/usb/usb_bus.h +++ b/sys/dev/usb/usb_bus.h @@ -51,7 +51,9 @@ struct usb_bus_stat { struct usb_bus { struct usb_bus_stat stats_err; struct usb_bus_stat stats_ok; +#if USB_HAVE_ROOT_MOUNT_HOLD struct root_hold_token *bus_roothold; +#endif /* * There are two callback processes. One for Giant locked * callbacks. One for non-Giant locked callbacks. This should diff --git a/sys/dev/usb/usb_dynamic.c b/sys/dev/usb/usb_dynamic.c index f8bb03f..58deb4e 100644 --- a/sys/dev/usb/usb_dynamic.c +++ b/sys/dev/usb/usb_dynamic.c @@ -68,7 +68,7 @@ usb_temp_setup_by_index_t *usb_temp_setup_by_index_p = &usb_temp_setup_by_index_ usb_temp_unsetup_t *usb_temp_unsetup_p = &usb_temp_unsetup_w; usb_test_quirk_t *usb_test_quirk_p = &usb_test_quirk_w; usb_quirk_ioctl_t *usb_quirk_ioctl_p = &usb_quirk_ioctl_w; -devclass_t usb_devclass_ptr = NULL; +devclass_t usb_devclass_ptr; static usb_error_t usb_temp_setup_by_index_w(struct usb_device *udev, uint16_t index) diff --git a/sys/dev/usb/usb_msctest.c b/sys/dev/usb/usb_msctest.c index 497e382..a1bc5fc 100644 --- a/sys/dev/usb/usb_msctest.c +++ b/sys/dev/usb/usb_msctest.c @@ -848,7 +848,7 @@ usb_msc_eject(struct usb_device *udev, uint8_t iface_index, int method) sizeof(scsi_tct_eject), USB_MS_HZ); break; default: - printf("usb_msc_eject: unknown eject method (%d)\n", method); + DPRINTF("Unknown eject method (%d)\n", method); break; } DPRINTF("Eject CD command status: %s\n", usbd_errstr(err)); diff --git a/sys/dev/usb/usb_process.c b/sys/dev/usb/usb_process.c index 34314f4..7493e39 100644 --- a/sys/dev/usb/usb_process.c +++ b/sys/dev/usb/usb_process.c @@ -24,8 +24,6 @@ * SUCH DAMAGE. */ -#define USB_DEBUG_VAR usb_proc_debug - #ifdef USB_GLOBAL_INCLUDE_FILE #include USB_GLOBAL_INCLUDE_FILE #else @@ -52,6 +50,8 @@ #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> #include <dev/usb/usb_process.h> + +#define USB_DEBUG_VAR usb_proc_debug #include <dev/usb/usb_debug.h> #include <dev/usb/usb_util.h> diff --git a/sys/dev/usb/usb_request.c b/sys/dev/usb/usb_request.c index 6a81945..4db5b7d 100644 --- a/sys/dev/usb/usb_request.c +++ b/sys/dev/usb/usb_request.c @@ -800,8 +800,6 @@ usbd_req_reset_port(struct usb_device *udev, struct mtx *mtx, uint8_t port) /* check for errors */ if (err) goto done; -#ifdef USB_DEBUG -#endif n = 0; while (1) { /* wait for the device to recover from reset */ |
