Merge tag 'omap-for-v3.9/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-beck.git] / arch / arm / mach-omap2 / usb-host.c

diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
index 940aad401279afa23681623c8ca2cd01818f149e..5706bdccf45ee34b643141337b38222fbaf5f63a 100644 (file)
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@ -37,14 +37,6 @@
 #define        USBHS_UHH_HWMODNAME     "usb_host_hs"
 #define USBHS_TLL_HWMODNAME    "usb_tll_hs"
 
-static struct omap_device_pm_latency omap_uhhtll_latency[] = {
-         {
-               .deactivate_func = omap_device_idle_hwmods,
-               .activate_func   = omap_device_enable_hwmods,
-               .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
-         },
-};
-
 /* MUX settings for EHCI pins */
 /*
  * setup_ehci_io_mux - initialize IO pad mux for USBHOST
@@ -511,9 +503,7 @@ void __init usbhs_init(struct usbhs_omap_platform_data *pdata)
        }
 
        pdev = omap_device_build(OMAP_USBTLL_DEVICE, bus_id, tll_hwm,
-                               pdata, sizeof(*pdata),
-                               omap_uhhtll_latency,
-                               ARRAY_SIZE(omap_uhhtll_latency), false);
+                               pdata, sizeof(*pdata));
        if (IS_ERR(pdev)) {
                pr_err("Could not build hwmod device %s\n",
                       USBHS_TLL_HWMODNAME);
@@ -521,9 +511,7 @@ void __init usbhs_init(struct usbhs_omap_platform_data *pdata)
        }
 
        pdev = omap_device_build(OMAP_USBHS_DEVICE, bus_id, uhh_hwm,
-                               pdata, sizeof(*pdata),
-                               omap_uhhtll_latency,
-                               ARRAY_SIZE(omap_uhhtll_latency), false);
+                               pdata, sizeof(*pdata));
        if (IS_ERR(pdev)) {
                pr_err("Could not build hwmod devices %s\n",
                       USBHS_UHH_HWMODNAME);