From owner-svn-src-head@FreeBSD.ORG Tue Feb 5 13:30:08 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id ECB16506; Tue, 5 Feb 2013 13:30:08 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D0336921; Tue, 5 Feb 2013 13:30:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r15DU8YE090819; Tue, 5 Feb 2013 13:30:08 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r15DU7vn090633; Tue, 5 Feb 2013 13:30:07 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201302051330.r15DU7vn090633@svn.freebsd.org> From: Hans Petter Selasky Date: Tue, 5 Feb 2013 13:30:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r246360 - head/sys/dev/usb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Feb 2013 13:30:09 -0000 Author: hselasky Date: Tue Feb 5 13:30:07 2013 New Revision: 246360 URL: http://svnweb.freebsd.org/changeset/base/246360 Log: Fix some nits. Modified: head/sys/dev/usb/usb_bus.h head/sys/dev/usb/usb_dynamic.c head/sys/dev/usb/usb_msctest.c head/sys/dev/usb/usb_process.c head/sys/dev/usb/usb_request.c Modified: head/sys/dev/usb/usb_bus.h ============================================================================== --- head/sys/dev/usb/usb_bus.h Tue Feb 5 12:37:50 2013 (r246359) +++ head/sys/dev/usb/usb_bus.h Tue Feb 5 13:30:07 2013 (r246360) @@ -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 Modified: head/sys/dev/usb/usb_dynamic.c ============================================================================== --- head/sys/dev/usb/usb_dynamic.c Tue Feb 5 12:37:50 2013 (r246359) +++ head/sys/dev/usb/usb_dynamic.c Tue Feb 5 13:30:07 2013 (r246360) @@ -68,7 +68,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: head/sys/dev/usb/usb_msctest.c ============================================================================== --- head/sys/dev/usb/usb_msctest.c Tue Feb 5 12:37:50 2013 (r246359) +++ head/sys/dev/usb/usb_msctest.c Tue Feb 5 13:30:07 2013 (r246360) @@ -848,7 +848,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: head/sys/dev/usb/usb_process.c ============================================================================== --- head/sys/dev/usb/usb_process.c Tue Feb 5 12:37:50 2013 (r246359) +++ head/sys/dev/usb/usb_process.c Tue Feb 5 13:30:07 2013 (r246360) @@ -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 #include #include + +#define USB_DEBUG_VAR usb_proc_debug #include #include Modified: head/sys/dev/usb/usb_request.c ============================================================================== --- head/sys/dev/usb/usb_request.c Tue Feb 5 12:37:50 2013 (r246359) +++ head/sys/dev/usb/usb_request.c Tue Feb 5 13:30:07 2013 (r246360) @@ -800,8 +800,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 */