Fix two occurrences of the Sparse warning:
warning: symbol XXX shadows an earlier one
Signed-off-by: Kris Borer <[email protected]>
---
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
On Fri, Aug 21, 2015 at 10:26:00AM -0400, Kris Borer wrote:
> Fix two occurrences of the Sparse warning:
>
> warning: symbol XXX shadows an earlier one
>
> Signed-off-by: Kris Borer <[email protected]>
Reviewed-by: Felipe Balbi <[email protected]>
> ---
> 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
>
--
balbi