Received: by 10.223.185.116 with SMTP id b49csp6365165wrg; Wed, 28 Feb 2018 08:13:27 -0800 (PST) X-Google-Smtp-Source: AH8x2242Pj8xjW/fAu7bJw7pC5hCVTa4Sf31vKQqgttkrYqZjt4K65+gbBF2sXEyD6BUeiEVG5Hd X-Received: by 10.167.130.12 with SMTP id k12mr18288970pfi.73.1519834407290; Wed, 28 Feb 2018 08:13:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519834407; cv=none; d=google.com; s=arc-20160816; b=ieWC+Aa0bNRGH2PzyxBKKEvDBHy6q0RNqIl2OcpJJRJm/2D5wt1xkwHuKdAOACAk7g hKTAZOafQwQ89zO6nK65HypGNxbTb0q7CqOBBDlDVjCp/pz9FETVY3w/nXvHUlQNl9Kd gddrqeHub1/l6xVeovYdd/goWp2+qis04HMzVOIH5qZ1PUF4dj10JgrJME43YPoUjkVA gUHSdA21KU6ZyKFuxtLE4TLZgOahjNWhujz+3vEn+upANQcburKREkfENwZQcRNvRSTb 3Kco2OvXggEq2Np/dck/8wO1YzoJN608PGvlIMKg5bXg+jiF4hqN9PWJaKA1hPfCU0bm ls3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition :arc-authentication-results; bh=BOl7NGfO8+soNz2zeJDKIp6gdIxLaC5TTV2UiV8jbZo=; b=k9R6BpeYNqT82AUqSziM6x4RLtCr2Q7h+7mWR3co9TfsShr98gEanyStmWYKYWlKzc 7YEkcRvoYfbSihMIRwW5eVSZ7xQoYaPGGec4jLC1iw3MIAfUOkHW7pCjojc033JaOF95 sbr/AswHiq6qSojM5t0qEHTRCD97oEIJd4iSMUjQh8i/c8yOSSBXQ34KZgbZ8XaOaFH/ R4A06YqjC7jDz75d8KSmz+3GTaJMmctk0FlYABe3+Y+aWATyHBb4UWjDWjyAelY50nqL mVqpv08UOgTHT24U3oUbtVUPMm1Xlkf0pDRUi1hWN9prgZCOcmSxEXH9OklhCs1278ij Br/g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p9si1140693pgc.685.2018.02.28.08.13.11; Wed, 28 Feb 2018 08:13:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934555AbeB1QIo (ORCPT + 99 others); Wed, 28 Feb 2018 11:08:44 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:34958 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932977AbeB1QIm (ORCPT ); Wed, 28 Feb 2018 11:08:42 -0500 Received: from [2a02:8011:400e:2:6f00:88c8:c921:d332] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1er3Yq-0006XT-Tw; Wed, 28 Feb 2018 15:22:29 +0000 Received: from ben by deadeye with local (Exim 4.90_1) (envelope-from ) id 1er3Yi-0000BV-DS; Wed, 28 Feb 2018 15:22:20 +0000 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Shuah Khan" , "Greg Kroah-Hartman" Date: Wed, 28 Feb 2018 15:20:18 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 164/254] usbip: remove kernel addresses from usb device and urb debug msgs In-Reply-To: X-SA-Exim-Connect-IP: 2a02:8011:400e:2:6f00:88c8:c921:d332 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.55-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Shuah Khan commit e1346fd87c71a1f61de1fe476ec8df1425ac931c upstream. usbip_dump_usb_device() and usbip_dump_urb() print kernel addresses. Remove kernel addresses from usb device and urb debug msgs and improve the message content. Instead of printing parent device and bus addresses, print parent device and bus names. Signed-off-by: Shuah Khan Signed-off-by: Greg Kroah-Hartman [bwh: Backported to 3.16: adjust filename] Signed-off-by: Ben Hutchings --- drivers/staging/usbip/usbip_common.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) --- a/drivers/staging/usbip/usbip_common.c +++ b/drivers/staging/usbip/usbip_common.c @@ -103,7 +103,7 @@ static void usbip_dump_usb_device(struct dev_dbg(dev, " devnum(%d) devpath(%s) usb speed(%s)", udev->devnum, udev->devpath, usb_speed_string(udev->speed)); - pr_debug("tt %p, ttport %d\n", udev->tt, udev->ttport); + pr_debug("tt hub ttport %d\n", udev->ttport); dev_dbg(dev, " "); for (i = 0; i < 16; i++) @@ -136,12 +136,8 @@ static void usbip_dump_usb_device(struct } pr_debug("\n"); - dev_dbg(dev, "parent %p, bus %p\n", udev->parent, udev->bus); - - dev_dbg(dev, - "descriptor %p, config %p, actconfig %p, rawdescriptors %p\n", - &udev->descriptor, udev->config, - udev->actconfig, udev->rawdescriptors); + dev_dbg(dev, "parent %s, bus %s\n", dev_name(&udev->parent->dev), + udev->bus->bus_name); dev_dbg(dev, "have_langid %d, string_langid %d\n", udev->have_langid, udev->string_langid); @@ -249,9 +245,6 @@ void usbip_dump_urb(struct urb *urb) dev = &urb->dev->dev; - dev_dbg(dev, " urb :%p\n", urb); - dev_dbg(dev, " dev :%p\n", urb->dev); - usbip_dump_usb_device(urb->dev); dev_dbg(dev, " pipe :%08x ", urb->pipe); @@ -260,11 +253,9 @@ void usbip_dump_urb(struct urb *urb) dev_dbg(dev, " status :%d\n", urb->status); dev_dbg(dev, " transfer_flags :%08X\n", urb->transfer_flags); - dev_dbg(dev, " transfer_buffer :%p\n", urb->transfer_buffer); dev_dbg(dev, " transfer_buffer_length:%d\n", urb->transfer_buffer_length); dev_dbg(dev, " actual_length :%d\n", urb->actual_length); - dev_dbg(dev, " setup_packet :%p\n", urb->setup_packet); if (urb->setup_packet && usb_pipetype(urb->pipe) == PIPE_CONTROL) usbip_dump_usb_ctrlrequest( @@ -274,8 +265,6 @@ void usbip_dump_urb(struct urb *urb) dev_dbg(dev, " number_of_packets :%d\n", urb->number_of_packets); dev_dbg(dev, " interval :%d\n", urb->interval); dev_dbg(dev, " error_count :%d\n", urb->error_count); - dev_dbg(dev, " context :%p\n", urb->context); - dev_dbg(dev, " complete :%p\n", urb->complete); } EXPORT_SYMBOL_GPL(usbip_dump_urb);