summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
authorKris Borer <kborer@gmail.com>2015-08-21 10:47:46 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-04 10:45:08 +0100
commit17a364e2eceafae9eac6b29d09a71ea21979b106 (patch)
tree61c0c692265cf22d8caa0aae7f60cda5f83c54b0 /drivers/usb/core
parent0c596336a8e73a1773f38159ae2ef7b062863d80 (diff)
downloadlinux-stable-17a364e2eceafae9eac6b29d09a71ea21979b106.tar.gz
linux-stable-17a364e2eceafae9eac6b29d09a71ea21979b106.tar.bz2
linux-stable-17a364e2eceafae9eac6b29d09a71ea21979b106.zip
usb: hub: remove redundant declarations
Fix two occurrences of the Sparse warning: warning: symbol XXX shadows an earlier one Signed-off-by: Kris Borer <kborer@gmail.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r--drivers/usb/core/hub.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 169e3d8df037..52427267e2a8 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++)