Re: [PATCH 1/4] usb: hub_activate kill an 'else'

[Alan Stern]

On Mon, 23 Sep 2013, Dan Williams wrote:

> Remove a few extra lines and make it clear that all implementations
> disable the port by sharing the same line of code.
> 
> Cc: Alan Stern 
> Signed-off-by: Dan Williams 
> ---
>  drivers/usb/core/hub.c |   11 ---
>  1 files changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
> index 5d859fc..69bbb51 100644
> --- a/drivers/usb/core/hub.c
> +++ b/drivers/usb/core/hub.c
> @@ -1107,16 +1107,13 @@ static void hub_activate(struct usb_hub *hub, enum 
> hub_activation_type type)
>   /*
>* USB3 protocol ports will automatically transition
>* to Enabled state when detect an USB3.0 device attach.
> -  * Do not disable USB3 protocol ports.
> +  * Do not disable USB3 protocol ports, just pretend
> +  * power was lost
>*/
> - if (!hub_is_superspeed(hdev)) {
> + portstatus &= ~USB_PORT_STAT_ENABLE;
> + if (!hub_is_superspeed(hdev))
>   usb_clear_port_feature(hdev, port1,
>  USB_PORT_FEAT_ENABLE);
> - portstatus &= ~USB_PORT_STAT_ENABLE;
> - } else {
> - /* Pretend that power was lost for USB3 devs */
> - portstatus &= ~USB_PORT_STAT_ENABLE;
> - }
>   }
>  
>   /* Clear status-change flags; we'll debounce later */

Acked-by: Alan Stern 

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/4] usb: hub_activate kill an 'else'

[Dan Williams]

Remove a few extra lines and make it clear that all implementations
disable the port by sharing the same line of code.

Cc: Alan Stern 
Signed-off-by: Dan Williams 
---
 drivers/usb/core/hub.c |   11 ---
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 5d859fc..69bbb51 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1107,16 +1107,13 @@ static void hub_activate(struct usb_hub *hub, enum 
hub_activation_type type)
/*
 * USB3 protocol ports will automatically transition
 * to Enabled state when detect an USB3.0 device attach.
-* Do not disable USB3 protocol ports.
+* Do not disable USB3 protocol ports, just pretend
+* power was lost
 */
-   if (!hub_is_superspeed(hdev)) {
+   portstatus &= ~USB_PORT_STAT_ENABLE;
+   if (!hub_is_superspeed(hdev))
usb_clear_port_feature(hdev, port1,
   USB_PORT_FEAT_ENABLE);
-   portstatus &= ~USB_PORT_STAT_ENABLE;
-   } else {
-   /* Pretend that power was lost for USB3 devs */
-   portstatus &= ~USB_PORT_STAT_ENABLE;
-   }
}
 
/* Clear status-change flags; we'll debounce later */

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html