diff options
Diffstat (limited to 'drivers/usb/host/ehci-atmel.c')
| -rw-r--r-- | drivers/usb/host/ehci-atmel.c | 19 | 
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c index cf14c95a670..a47e2cffaaf 100644 --- a/drivers/usb/host/ehci-atmel.c +++ b/drivers/usb/host/ehci-atmel.c @@ -53,30 +53,15 @@ static void atmel_stop_ehci(struct platform_device *pdev)  static int ehci_atmel_setup(struct usb_hcd *hcd)  {  	struct ehci_hcd *ehci = hcd_to_ehci(hcd); -	int retval = 0; +	int retval;  	/* registers start at offset 0x0 */  	ehci->caps = hcd->regs; -	ehci->regs = hcd->regs + -		HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase)); -	dbg_hcs_params(ehci, "reset"); -	dbg_hcc_params(ehci, "reset"); - -	/* cache this readonly data; minimize chip reads */ -	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); - -	retval = ehci_halt(ehci); -	if (retval) -		return retval; -	/* data structure init */ -	retval = ehci_init(hcd); +	retval = ehci_setup(hcd);  	if (retval)  		return retval; -	ehci->sbrn = 0x20; - -	ehci_reset(ehci);  	ehci_port_power(ehci, 0);  	return retval;  |