Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[pandora-kernel.git] / arch / arm / mach-omap2 / timer.c

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 1140e98..037b0d7 100644 (file)
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -408,14 +408,6 @@ static int omap2_dm_timer_set_src(struct platform_device *pdev, int source)
        return ret;
 }
 
-struct omap_device_pm_latency omap2_dmtimer_latency[] = {
-       {
-               .deactivate_func = omap_device_idle_hwmods,
-               .activate_func   = omap_device_enable_hwmods,
-               .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
-       },
-};
-
 /**
  * omap_timer_init - build and register timer device with an
  * associated timer hwmod
@@ -434,7 +426,7 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused)
        int ret = 0;
        char *name = "omap_timer";
        struct dmtimer_platform_data *pdata;
-       struct omap_device *od;
+       struct platform_device *pdev;
        struct omap_timer_capability_dev_attr *timer_dev_attr;
        struct powerdomain *pwrdm;
 
@@ -476,12 +468,10 @@ static int __init omap_timer_init(struct omap_hwmod *oh, void *unused)
 #ifdef CONFIG_PM
        pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count;
 #endif
-       od = omap_device_build(name, id, oh, pdata, sizeof(*pdata),
-                       omap2_dmtimer_latency,
-                       ARRAY_SIZE(omap2_dmtimer_latency),
-                       0);
+       pdev = omap_device_build(name, id, oh, pdata, sizeof(*pdata),
+                                NULL, 0, 0);
 
-       if (IS_ERR(od)) {
+       if (IS_ERR(pdev)) {
                pr_err("%s: Can't build omap_device for %s: %s.\n",
                        __func__, name, oh->name);
                ret = -EINVAL;