diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-22 17:51:09 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-11-21 15:46:44 -0800 |
| commit | ff07a23fec3f9ea28d22852097260b38903891c4 (patch) | |
| tree | 33b6dfac09a3e8b1eebfd0cdf9f57b1cda51024d /drivers/firmware | |
| parent | 0c86a6bd85ff0629cd2c5141027fc1c8bb6cde9c (diff) | |
| download | linux-ff07a23fec3f9ea28d22852097260b38903891c4.tar.gz linux-ff07a23fec3f9ea28d22852097260b38903891c4.tar.bz2 linux-ff07a23fec3f9ea28d22852097260b38903891c4.zip | |
drivers/firmware: psci: 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. Also adds missing call to
destroy_timer_on_stack().
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/psci_checker.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/psci_checker.c b/drivers/firmware/psci_checker.c index 56cf825ed779..f3f4f810e5df 100644 --- a/drivers/firmware/psci_checker.c +++ b/drivers/firmware/psci_checker.c @@ -220,7 +220,7 @@ out_free_cpus: return err; } -static void dummy_callback(unsigned long ignored) {} +static void dummy_callback(struct timer_list *unused) {} static int suspend_cpu(int index, bool broadcast) { @@ -287,7 +287,7 @@ static int suspend_test_thread(void *arg) pr_info("CPU %d entering suspend cycles, states 1 through %d\n", cpu, drv->state_count - 1); - setup_timer_on_stack(&wakeup_timer, dummy_callback, 0); + timer_setup_on_stack(&wakeup_timer, dummy_callback, 0); for (i = 0; i < NUM_SUSPEND_CYCLE; ++i) { int index; /* |