diff options
author | Kris Borer <kborer@gmail.com> | 2015-08-21 01:17:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-04 05:45:08 -0400 |
commit | 17a364e2eceafae9eac6b29d09a71ea21979b106 (patch) | |
tree | 61c0c692265cf22d8caa0aae7f60cda5f83c54b0 | |
parent | 0c596336a8e73a1773f38159ae2ef7b062863d80 (diff) |
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>
-rw-r--r-- | drivers/usb/core/hub.c | 3 |
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) | |||
1070 | * for HUB_POST_RESET, but it's easier not to. | 1070 | * for HUB_POST_RESET, but it's easier not to. |
1071 | */ | 1071 | */ |
1072 | if (type == HUB_INIT) { | 1072 | if (type == HUB_INIT) { |
1073 | unsigned delay = hub_power_on_good_delay(hub); | 1073 | delay = hub_power_on_good_delay(hub); |
1074 | 1074 | ||
1075 | hub_power_on(hub, false); | 1075 | hub_power_on(hub, false); |
1076 | INIT_DELAYED_WORK(&hub->init_work, hub_init_func2); | 1076 | INIT_DELAYED_WORK(&hub->init_work, hub_init_func2); |
@@ -1404,7 +1404,6 @@ static int hub_configure(struct usb_hub *hub, | |||
1404 | /* FIXME for USB 3.0, skip for now */ | 1404 | /* FIXME for USB 3.0, skip for now */ |
1405 | if ((wHubCharacteristics & HUB_CHAR_COMPOUND) && | 1405 | if ((wHubCharacteristics & HUB_CHAR_COMPOUND) && |
1406 | !(hub_is_superspeed(hdev))) { | 1406 | !(hub_is_superspeed(hdev))) { |
1407 | int i; | ||
1408 | char portstr[USB_MAXCHILDREN + 1]; | 1407 | char portstr[USB_MAXCHILDREN + 1]; |
1409 | 1408 | ||
1410 | for (i = 0; i < maxchild; i++) | 1409 | for (i = 0; i < maxchild; i++) |