diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 00:22:54 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 00:22:54 +0100 |
| commit | c6c3a3a03e6de52866bc81a32fc551733625d553 (patch) | |
| tree | b55967a9163dba315e2543d648de758b82c85fa1 /arch/arm/mach-omap2/hwspinlock.c | |
| parent | 07e87e15b969a05a7943d7ff1abc2d8da287171c (diff) | |
| parent | 8aca3ab5865f8cfbde841b6daf9442cc2279ced3 (diff) | |
| download | linux-c6c3a3a03e6de52866bc81a32fc551733625d553.tar.bz2 | |
Merge branch 'omap/cleanup' into next/cleanup2
Diffstat (limited to 'arch/arm/mach-omap2/hwspinlock.c')
| -rw-r--r-- | arch/arm/mach-omap2/hwspinlock.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/arch/arm/mach-omap2/hwspinlock.c b/arch/arm/mach-omap2/hwspinlock.c index 06d4a80660a5..36e21091b06a 100644 --- a/arch/arm/mach-omap2/hwspinlock.c +++ b/arch/arm/mach-omap2/hwspinlock.c @@ -23,19 +23,11 @@ #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; struct omap_hwmod *oh; - struct omap_device *od; + struct platform_device *pdev; const char *oh_name = "spinlock"; const char *dev_name = "omap_hwspinlock"; @@ -48,13 +40,11 @@ int __init hwspinlocks_init(void) if (oh == NULL) return -EINVAL; - od = omap_device_build(dev_name, 0, oh, NULL, 0, - omap_spinlock_latency, - ARRAY_SIZE(omap_spinlock_latency), false); - if (IS_ERR(od)) { + 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); - retval = PTR_ERR(od); + retval = PTR_ERR(pdev); } return retval; |