diff options
Diffstat (limited to 'drivers/usb/host/ehci-xls.c')
| -rw-r--r-- | drivers/usb/host/ehci-xls.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/usb/host/ehci-xls.c b/drivers/usb/host/ehci-xls.c index 72f08196f8cd..8dc6a22d90b8 100644 --- a/drivers/usb/host/ehci-xls.c +++ b/drivers/usb/host/ehci-xls.c | |||
| @@ -14,30 +14,11 @@ | |||
| 14 | 14 | ||
| 15 | static int ehci_xls_setup(struct usb_hcd *hcd) | 15 | static int ehci_xls_setup(struct usb_hcd *hcd) |
| 16 | { | 16 | { |
| 17 | int retval; | ||
| 18 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); | 17 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); |
| 19 | 18 | ||
| 20 | ehci->caps = hcd->regs; | 19 | ehci->caps = hcd->regs; |
| 21 | ehci->regs = hcd->regs + | ||
| 22 | HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase)); | ||
| 23 | dbg_hcs_params(ehci, "reset"); | ||
| 24 | dbg_hcc_params(ehci, "reset"); | ||
| 25 | 20 | ||
| 26 | /* cache this readonly data; minimize chip reads */ | 21 | return ehci_setup(hcd); |
| 27 | ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); | ||
| 28 | |||
| 29 | retval = ehci_halt(ehci); | ||
| 30 | if (retval) | ||
| 31 | return retval; | ||
| 32 | |||
| 33 | /* data structure init */ | ||
| 34 | retval = ehci_init(hcd); | ||
| 35 | if (retval) | ||
| 36 | return retval; | ||
| 37 | |||
| 38 | ehci_reset(ehci); | ||
| 39 | |||
| 40 | return retval; | ||
| 41 | } | 22 | } |
| 42 | 23 | ||
| 43 | int ehci_xls_probe_internal(const struct hc_driver *driver, | 24 | int ehci_xls_probe_internal(const struct hc_driver *driver, |
