Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[sfrench/cifs-2.6.git] / drivers / base / power / wakeup.c

diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index cdd6f256da597cb2abad069538d09723b2250d87..680ee1d36ac9a7f31b182b977f062aed1a590c8b 100644 (file)
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -54,7 +54,7 @@ static unsigned int saved_count;
 
 static DEFINE_SPINLOCK(events_lock);
 
-static void pm_wakeup_timer_fn(unsigned long data);
+static void pm_wakeup_timer_fn(struct timer_list *t);
 
 static LIST_HEAD(wakeup_sources);
 
@@ -176,7 +176,7 @@ void wakeup_source_add(struct wakeup_source *ws)
                return;
 
        spin_lock_init(&ws->lock);
-       setup_timer(&ws->timer, pm_wakeup_timer_fn, (unsigned long)ws);
+       timer_setup(&ws->timer, pm_wakeup_timer_fn, 0);
        ws->active = false;
        ws->last_time = ktime_get();
 
@@ -481,8 +481,7 @@ static bool wakeup_source_not_registered(struct wakeup_source *ws)
         * Use timer struct to check if the given source is initialized
         * by wakeup_source_add.
         */
-       return ws->timer.function != pm_wakeup_timer_fn ||
-                  ws->timer.data != (unsigned long)ws;
+       return ws->timer.function != (TIMER_FUNC_TYPE)pm_wakeup_timer_fn;
 }
 
 /*
@@ -724,9 +723,9 @@ EXPORT_SYMBOL_GPL(pm_relax);
  * in @data if it is currently active and its timer has not been canceled and
  * the expiration time of the timer is not in future.
  */
-static void pm_wakeup_timer_fn(unsigned long data)
+static void pm_wakeup_timer_fn(struct timer_list *t)
 {
-       struct wakeup_source *ws = (struct wakeup_source *)data;
+       struct wakeup_source *ws = from_timer(ws, t, timer);
        unsigned long flags;
 
        spin_lock_irqsave(&ws->lock, flags);