aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-tegra.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/host/ehci-tegra.c')
-rw-r--r--drivers/usb/host/ehci-tegra.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 7ef00ecb0da1..572634cd95d6 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -51,10 +51,6 @@ struct tegra_ehci_soc_config {
51 bool has_hostpc; 51 bool has_hostpc;
52}; 52};
53 53
54static int (*orig_hub_control)(struct usb_hcd *hcd,
55 u16 typeReq, u16 wValue, u16 wIndex,
56 char *buf, u16 wLength);
57
58struct tegra_ehci_hcd { 54struct tegra_ehci_hcd {
59 struct tegra_usb_phy *phy; 55 struct tegra_usb_phy *phy;
60 struct clk *clk; 56 struct clk *clk;
@@ -236,7 +232,7 @@ static int tegra_ehci_hub_control(
236 spin_unlock_irqrestore(&ehci->lock, flags); 232 spin_unlock_irqrestore(&ehci->lock, flags);
237 233
238 /* Handle the hub control events here */ 234 /* Handle the hub control events here */
239 return orig_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength); 235 return ehci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength);
240 236
241done: 237done:
242 spin_unlock_irqrestore(&ehci->lock, flags); 238 spin_unlock_irqrestore(&ehci->lock, flags);
@@ -554,8 +550,6 @@ static int __init ehci_tegra_init(void)
554 * too easy. 550 * too easy.
555 */ 551 */
556 552
557 orig_hub_control = tegra_ehci_hc_driver.hub_control;
558
559 tegra_ehci_hc_driver.map_urb_for_dma = tegra_ehci_map_urb_for_dma; 553 tegra_ehci_hc_driver.map_urb_for_dma = tegra_ehci_map_urb_for_dma;
560 tegra_ehci_hc_driver.unmap_urb_for_dma = tegra_ehci_unmap_urb_for_dma; 554 tegra_ehci_hc_driver.unmap_urb_for_dma = tegra_ehci_unmap_urb_for_dma;
561 tegra_ehci_hc_driver.hub_control = tegra_ehci_hub_control; 555 tegra_ehci_hc_driver.hub_control = tegra_ehci_hub_control;