Commit d5272003 authored Oct 12, 2017 by Kees Cook

ACPI / APEI: 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.

Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <lenb@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Tyler Baicar <tbaicar@codeaurora.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: "Jonathan (Zhixiong) Zhang" <zjzhang@codeaurora.org>
Cc: Shiju Jose <shiju.jose@huawei.com>
Cc: linux-acpi@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Tested-by: Tyler Baicar <tbaicar@codeaurora.org>

parent 9b5dfbdd

drivers/acpi/apei/ghes.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -774,9 +774,9 @@ static void ghes_add_timer(struct ghes *ghes)
		add_timer(&ghes->timer);
		}

		static void ghes_poll_func(unsigned long data)
		static void ghes_poll_func(struct timer_list *t)
		{
		struct ghes ghes = (void )data;
		struct ghes *ghes = from_timer(ghes, t, timer);

		ghes_proc(ghes);
		if (!(ghes->flags & GHES_EXITING))
		@@ -1147,8 +1147,7 @@ static int ghes_probe(struct platform_device *ghes_dev)

		switch (generic->notify.type) {
		case ACPI_HEST_NOTIFY_POLLED:
		setup_deferrable_timer(&ghes->timer, ghes_poll_func,
		(unsigned long)ghes);
		timer_setup(&ghes->timer, ghes_poll_func, TIMER_DEFERRABLE);
		ghes_add_timer(ghes);
		break;
		case ACPI_HEST_NOTIFY_EXTERNAL:

Admin message