Re: [PATCH 2/2] ehci : merge hostpc reset in tdi_reset

[Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>]

On Fri, 22 Jun 2012, Matthieu CASTET wrote:

> Signed-off-by: Matthieu CASTET <matthieu.castet@xxxxxxxxxx>
> Reviewed-by: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
> ---
>  drivers/usb/host/ehci-hcd.c |   22 ++++++++++++++--------
>  1 file changed, 14 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
> index 9de7ba4..8bebf4b 100644
> --- a/drivers/usb/host/ehci-hcd.c
> +++ b/drivers/usb/host/ehci-hcd.c
> @@ -206,7 +206,10 @@ static int tdi_in_host_mode (struct ehci_hcd *ehci)
>  	u32 __iomem	*reg_ptr;
>  	u32		tmp;
>  
> -	reg_ptr = (u32 __iomem *)(((u8 __iomem *)ehci->regs) + USBMODE);
> +	if (ehci->has_hostpc)
> +		reg_ptr = (u32 __iomem *)(((u8 __iomem *)ehci->regs) + USBMODE_EX);
> +	else
> +		reg_ptr = (u32 __iomem *)(((u8 __iomem *)ehci->regs) + USBMODE);
>  	tmp = ehci_readl(ehci, reg_ptr);
>  	return (tmp & 3) == USBMODE_CM_HC;
>  }
...

NAK on this patch.  I'm getting awfully tired of all this ugly code.

Please rebase this to go on top of the patch I'm about to submit.

Alan Stern

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