diff options
Diffstat (limited to 'drivers/usb/host/ehci-octeon.c')
-rw-r--r-- | drivers/usb/host/ehci-octeon.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/usb/host/ehci-octeon.c b/drivers/usb/host/ehci-octeon.c index c0104882c72d..ba26957abf46 100644 --- a/drivers/usb/host/ehci-octeon.c +++ b/drivers/usb/host/ehci-octeon.c | |||
@@ -56,7 +56,7 @@ static const struct hc_driver ehci_octeon_hc_driver = { | |||
56 | /* | 56 | /* |
57 | * basic lifecycle operations | 57 | * basic lifecycle operations |
58 | */ | 58 | */ |
59 | .reset = ehci_init, | 59 | .reset = ehci_setup, |
60 | .start = ehci_run, | 60 | .start = ehci_run, |
61 | .stop = ehci_stop, | 61 | .stop = ehci_stop, |
62 | .shutdown = ehci_shutdown, | 62 | .shutdown = ehci_shutdown, |
@@ -150,12 +150,6 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev) | |||
150 | #endif | 150 | #endif |
151 | 151 | ||
152 | ehci->caps = hcd->regs; | 152 | ehci->caps = hcd->regs; |
153 | ehci->regs = hcd->regs + | ||
154 | HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase)); | ||
155 | /* cache this readonly data; minimize chip reads */ | ||
156 | ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); | ||
157 | |||
158 | ehci_reset(ehci); | ||
159 | 153 | ||
160 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); | 154 | ret = usb_add_hcd(hcd, irq, IRQF_SHARED); |
161 | if (ret) { | 155 | if (ret) { |