summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/hwspinlock.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-10-04 13:54:30 -0700
committerTony Lindgren <tony@atomide.com>2011-10-04 13:54:30 -0700
commit3ae3e253db7385238dd9d6c67c085afa3e770a56 (patch)
treec3f93d9742c4654c9d10af829db1122bac0b6f6f /arch/arm/mach-omap2/hwspinlock.c
parentc541c15fb5ab48c47bc9b90121538fd30d152f23 (diff)
parent476b679a5d785d1244f6b43ad26877acf278cd18 (diff)
Merge branch 'for_3.2/3_omap_devicetree' of git://gitorious.org/omap-pm/linux into dt
Diffstat (limited to 'arch/arm/mach-omap2/hwspinlock.c')
-rw-r--r--arch/arm/mach-omap2/hwspinlock.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/hwspinlock.c b/arch/arm/mach-omap2/hwspinlock.c
index 0b3ae9d9c3b3..36e21091b06a 100644
--- a/arch/arm/mach-omap2/hwspinlock.c
+++ b/arch/arm/mach-omap2/hwspinlock.c
@@ -23,14 +23,6 @@
#include <plat/omap_hwmod.h>
#include <plat/omap_device.h>
-struct omap_device_pm_latency omap_spinlock_latency[] = {
- {
- .deactivate_func = omap_device_idle_hwmods,
- .activate_func = omap_device_enable_hwmods,
- .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
- }
-};
-
int __init hwspinlocks_init(void)
{
int retval = 0;
@@ -48,9 +40,7 @@ int __init hwspinlocks_init(void)
if (oh == NULL)
return -EINVAL;
- pdev = omap_device_build(dev_name, 0, oh, NULL, 0,
- omap_spinlock_latency,
- ARRAY_SIZE(omap_spinlock_latency), false);
+ pdev = omap_device_build(dev_name, 0, oh, NULL, 0, NULL, 0, false);
if (IS_ERR(pdev)) {
pr_err("Can't build omap_device for %s:%s\n", dev_name,
oh_name);