]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
usb: hub: remove redundant declarations
authorKris Borer <kborer@gmail.com>
Fri, 21 Aug 2015 05:17:46 +0000 (10:47 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 Oct 2015 09:45:08 +0000 (10:45 +0100)
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>
drivers/usb/core/hub.c

index 169e3d8df037655b209ef654eee9e1da7b0a2085..52427267e2a8eacf0ca2452fa59283c2ce492a77 100644 (file)
@@ -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++)