public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Kris Borer <kborer@gmail.com>
To: gregkh@linuxfoundation.org
Cc: stern@rowland.harvard.edu, pmladek@suse.cz,
	peter.chen@freescale.com, balbi@ti.com, mjg59@coreos.com,
	chasemetzger15@gmail.com, Robert.Schlabbach@gmx.net,
	jin.can.zhuang@intel.com, linux-usb@vger.kernel.org,
	linux-kernel@vger.kernel.org, Kris Borer <kborer@gmail.com>
Subject: [PATCH] usb: hub: remove redundant declarations
Date: Fri, 21 Aug 2015 10:26:00 -0400	[thread overview]
Message-ID: <1440167160-8527-1-git-send-email-kborer@gmail.com> (raw)

Fix two occurrences of the Sparse warning:

warning: symbol XXX shadows an earlier one

Signed-off-by: Kris Borer <kborer@gmail.com>
---
 drivers/usb/core/hub.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 431839b..a0db6a4 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1070,7 +1070,7 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
 		 * for HUB_POST_RESET, but it's easier not to.
 		 */
 		if (type == HUB_INIT) {
-			unsigned delay = hub_power_on_good_delay(hub);
+			delay = hub_power_on_good_delay(hub);
 
 			hub_power_on(hub, false);
 			INIT_DELAYED_WORK(&hub->init_work, hub_init_func2);
@@ -1404,7 +1404,6 @@ static int hub_configure(struct usb_hub *hub,
 	/* FIXME for USB 3.0, skip for now */
 	if ((wHubCharacteristics & HUB_CHAR_COMPOUND) &&
 			!(hub_is_superspeed(hdev))) {
-		int	i;
 		char	portstr[USB_MAXCHILDREN + 1];
 
 		for (i = 0; i < maxchild; i++)
-- 
1.9.1


             reply	other threads:[~2015-08-21 14:36 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-21 14:26 Kris Borer [this message]
2015-08-21 14:39 ` [PATCH] usb: hub: remove redundant declarations Felipe Balbi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1440167160-8527-1-git-send-email-kborer@gmail.com \
    --to=kborer@gmail.com \
    --cc=Robert.Schlabbach@gmx.net \
    --cc=balbi@ti.com \
    --cc=chasemetzger15@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jin.can.zhuang@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=mjg59@coreos.com \
    --cc=peter.chen@freescale.com \
    --cc=pmladek@suse.cz \
    --cc=stern@rowland.harvard.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox