diff options
| author |   Kees Cook <keescook@chromium.org> | 2017-10-16 16:20:55 -0700 |
|---|---|---|
| committer |   Rafael J. Wysocki <rjw@rjwysocki.net> | 2017-10-24 10:27:42 +0200 |
| commit | 96428e98aebe5db8a164711f102808651c7f518d (patch) | |
| tree | d587150088277fb9e381747e88d940093617d4c8 /drivers/base/power/runtime.c | |
| parent | PM / core: Fix kerneldoc comments of four functions (diff) | |
| download | linux-dev-96428e98aebe5db8a164711f102808651c7f518d.tar.xz linux-dev-96428e98aebe5db8a164711f102808651c7f518d.zip | |
PM / core: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly. Removes test of .data field, since
that will be going away.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/base/power/runtime.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 7bcf80fa9ada..1cea431c0adf 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -894,9 +894,9 @@ static void pm_runtime_work(struct work_struct *work) * * Check if the time is right and queue a suspend request. */ -static void pm_suspend_timer_fn(unsigned long data) +static void pm_suspend_timer_fn(struct timer_list *t) { - struct device *dev = (struct device *)data; + struct device *dev = from_timer(dev, t, power.suspend_timer); unsigned long flags; unsigned long expires; @@ -1499,8 +1499,7 @@ void pm_runtime_init(struct device *dev) INIT_WORK(&dev->power.work, pm_runtime_work); dev->power.timer_expires = 0; - setup_timer(&dev->power.suspend_timer, pm_suspend_timer_fn, - (unsigned long)dev); + timer_setup(&dev->power.suspend_timer, pm_suspend_timer_fn, 0); init_waitqueue_head(&dev->power.wait_queue); } |