diff options
| author | Matthieu CASTET <castet.matthieu@free.fr> | 2011-07-02 14:59:46 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-08 17:51:29 -0400 |
| commit | 2cb30bb11963907acdd69f77e77b3fabb16cfa62 (patch) | |
| tree | 10a52321d34a7cd628eac7a43d5f0848b49f09fb /drivers/usb | |
| parent | e931830bb877e2aad9a1be83506f9bdb26c91e4e (diff) | |
ehci-msm : use ehci_setup
Signed-off-by: Matthieu CASTET <castet.matthieu@free.fr>
Tested-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ehci-msm.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c index b5a0bf649c95..592d5f76803e 100644 --- a/drivers/usb/host/ehci-msm.c +++ b/drivers/usb/host/ehci-msm.c | |||
| @@ -40,27 +40,9 @@ static int ehci_msm_reset(struct usb_hcd *hcd) | |||
| 40 | int retval; | 40 | int retval; |
| 41 | 41 | ||
| 42 | ehci->caps = USB_CAPLENGTH; | 42 | ehci->caps = USB_CAPLENGTH; |
| 43 | ehci->regs = USB_CAPLENGTH + | ||
| 44 | HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase)); | ||
| 45 | dbg_hcs_params(ehci, "reset"); | ||
| 46 | dbg_hcc_params(ehci, "reset"); | ||
| 47 | |||
| 48 | /* cache the data to minimize the chip reads*/ | ||
| 49 | ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); | ||
| 50 | |||
| 51 | hcd->has_tt = 1; | 43 | hcd->has_tt = 1; |
| 52 | ehci->sbrn = HCD_USB2; | ||
| 53 | |||
| 54 | retval = ehci_halt(ehci); | ||
| 55 | if (retval) | ||
| 56 | return retval; | ||
| 57 | |||
| 58 | /* data structure init */ | ||
| 59 | retval = ehci_init(hcd); | ||
| 60 | if (retval) | ||
| 61 | return retval; | ||
| 62 | 44 | ||
| 63 | retval = ehci_reset(ehci); | 45 | retval = ehci_setup(hcd); |
| 64 | if (retval) | 46 | if (retval) |
| 65 | return retval; | 47 | return retval; |
| 66 | 48 | ||
