ehci-msm : use ehci_setup
authorMatthieu CASTET <castet.matthieu@free.fr>
Sat, 2 Jul 2011 18:59:46 +0000 (20:59 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 8 Jul 2011 21:51:29 +0000 (14:51 -0700)
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>
drivers/usb/host/ehci-msm.c

index b5a0bf649c95e5a9cb5d918ceaba90e18a4e4da9..592d5f76803eef7b75670f5f0b78c4dfa8083856 100644 (file)
@@ -40,27 +40,9 @@ static int ehci_msm_reset(struct usb_hcd *hcd)
        int retval;
 
        ehci->caps = USB_CAPLENGTH;
-       ehci->regs = USB_CAPLENGTH +
-               HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));
-       dbg_hcs_params(ehci, "reset");
-       dbg_hcc_params(ehci, "reset");
-
-       /* cache the data to minimize the chip reads*/
-       ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
-
        hcd->has_tt = 1;
-       ehci->sbrn = HCD_USB2;
-
-       retval = ehci_halt(ehci);
-       if (retval)
-               return retval;
-
-       /* data structure init */
-       retval = ehci_init(hcd);
-       if (retval)
-               return retval;
 
-       retval = ehci_reset(ehci);
+       retval = ehci_setup(hcd);
        if (retval)
                return retval;