Date: Fri, 31 Oct 2014 08:06:21 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r273889 - stable/9/sys/dev/usb Message-ID: <201410310806.s9V86LVG067643@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Fri Oct 31 08:06:21 2014 New Revision: 273889 URL: https://svnweb.freebsd.org/changeset/base/273889 Log: MFC r246360: Fix some nits. Modified: stable/9/sys/dev/usb/usb_dynamic.c stable/9/sys/dev/usb/usb_msctest.c stable/9/sys/dev/usb/usb_process.c stable/9/sys/dev/usb/usb_request.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/usb_dynamic.c ============================================================================== --- stable/9/sys/dev/usb/usb_dynamic.c Fri Oct 31 08:00:22 2014 (r273888) +++ stable/9/sys/dev/usb/usb_dynamic.c Fri Oct 31 08:06:21 2014 (r273889) @@ -64,7 +64,7 @@ usb_temp_setup_by_index_t *usb_temp_setu 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) Modified: stable/9/sys/dev/usb/usb_msctest.c ============================================================================== --- stable/9/sys/dev/usb/usb_msctest.c Fri Oct 31 08:00:22 2014 (r273888) +++ stable/9/sys/dev/usb/usb_msctest.c Fri Oct 31 08:06:21 2014 (r273889) @@ -839,7 +839,7 @@ usb_msc_eject(struct usb_device *udev, u 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)); Modified: stable/9/sys/dev/usb/usb_process.c ============================================================================== --- stable/9/sys/dev/usb/usb_process.c Fri Oct 31 08:00:22 2014 (r273888) +++ stable/9/sys/dev/usb/usb_process.c Fri Oct 31 08:06:21 2014 (r273889) @@ -24,8 +24,6 @@ * SUCH DAMAGE. */ -#define USB_DEBUG_VAR usb_proc_debug - #include <sys/stdint.h> #include <sys/stddef.h> #include <sys/param.h> @@ -49,6 +47,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> Modified: stable/9/sys/dev/usb/usb_request.c ============================================================================== --- stable/9/sys/dev/usb/usb_request.c Fri Oct 31 08:00:22 2014 (r273888) +++ stable/9/sys/dev/usb/usb_request.c Fri Oct 31 08:06:21 2014 (r273889) @@ -804,8 +804,6 @@ usbd_req_reset_port(struct usb_device *u /* check for errors */ if (err) goto done; -#ifdef USB_DEBUG -#endif n = 0; while (1) { /* wait for the device to recover from reset */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410310806.s9V86LVG067643>