From owner-svn-src-all@FreeBSD.ORG Fri Oct 31 08:06:23 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2022AE11; Fri, 31 Oct 2014 08:06:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E10A79FF; Fri, 31 Oct 2014 08:06:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9V86MiC067647; Fri, 31 Oct 2014 08:06:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9V86LVG067643; Fri, 31 Oct 2014 08:06:21 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201410310806.s9V86LVG067643@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 31 Oct 2014 08:06:21 +0000 (UTC) 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 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Oct 2014 08:06:23 -0000 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 #include #include @@ -49,6 +47,8 @@ #include #include #include + +#define USB_DEBUG_VAR usb_proc_debug #include #include 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 */