diff options
author | Paul Walmsley <paul@pwsan.com> | 2013-01-26 02:48:53 -0500 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2013-01-26 02:48:53 -0500 |
commit | c1d1cd597fc77af3086470f8627d77f52f7f8b6c (patch) | |
tree | f27c44213bf5185a967b349c80919f9372569aef /arch/arm/mach-omap2/usb-host.c | |
parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) |
ARM: OMAP2+: omap_device: remove obsolete pm_lats and early_device code
Remove now-obsolete code from arch/arm/mach-omap2/omap_device.c. This
mostly consists of removing the first attempt at device PM latency
handling. This was never really used, has been replaced by the common
dev_pm_qos code, and needs to go away as part of the DT conversion.
Also, the early platform_device creation code has been removed, as it
appears to be unused.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-omap2/usb-host.c')
-rw-r--r-- | arch/arm/mach-omap2/usb-host.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c index 2e44e8a22884..99f04deb4c7f 100644 --- a/arch/arm/mach-omap2/usb-host.c +++ b/arch/arm/mach-omap2/usb-host.c | |||
@@ -42,14 +42,6 @@ static struct usbtll_omap_platform_data usbtll_data; | |||
42 | static struct ehci_hcd_omap_platform_data ehci_data; | 42 | static struct ehci_hcd_omap_platform_data ehci_data; |
43 | static struct ohci_hcd_omap_platform_data ohci_data; | 43 | static struct ohci_hcd_omap_platform_data ohci_data; |
44 | 44 | ||
45 | static struct omap_device_pm_latency omap_uhhtll_latency[] = { | ||
46 | { | ||
47 | .deactivate_func = omap_device_idle_hwmods, | ||
48 | .activate_func = omap_device_enable_hwmods, | ||
49 | .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST, | ||
50 | }, | ||
51 | }; | ||
52 | |||
53 | /* MUX settings for EHCI pins */ | 45 | /* MUX settings for EHCI pins */ |
54 | /* | 46 | /* |
55 | * setup_ehci_io_mux - initialize IO pad mux for USBHOST | 47 | * setup_ehci_io_mux - initialize IO pad mux for USBHOST |
@@ -530,9 +522,7 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata) | |||
530 | } | 522 | } |
531 | 523 | ||
532 | pdev = omap_device_build(OMAP_USBTLL_DEVICE, bus_id, tll_hwm, | 524 | pdev = omap_device_build(OMAP_USBTLL_DEVICE, bus_id, tll_hwm, |
533 | &usbtll_data, sizeof(usbtll_data), | 525 | &usbtll_data, sizeof(usbtll_data)); |
534 | omap_uhhtll_latency, | ||
535 | ARRAY_SIZE(omap_uhhtll_latency), false); | ||
536 | if (IS_ERR(pdev)) { | 526 | if (IS_ERR(pdev)) { |
537 | pr_err("Could not build hwmod device %s\n", | 527 | pr_err("Could not build hwmod device %s\n", |
538 | USBHS_TLL_HWMODNAME); | 528 | USBHS_TLL_HWMODNAME); |
@@ -540,9 +530,7 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata) | |||
540 | } | 530 | } |
541 | 531 | ||
542 | pdev = omap_device_build(OMAP_USBHS_DEVICE, bus_id, uhh_hwm, | 532 | pdev = omap_device_build(OMAP_USBHS_DEVICE, bus_id, uhh_hwm, |
543 | &usbhs_data, sizeof(usbhs_data), | 533 | &usbhs_data, sizeof(usbhs_data)); |
544 | omap_uhhtll_latency, | ||
545 | ARRAY_SIZE(omap_uhhtll_latency), false); | ||
546 | if (IS_ERR(pdev)) { | 534 | if (IS_ERR(pdev)) { |
547 | pr_err("Could not build hwmod devices %s\n", | 535 | pr_err("Could not build hwmod devices %s\n", |
548 | USBHS_UHH_HWMODNAME); | 536 | USBHS_UHH_HWMODNAME); |