Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c318fa9 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

tty/sysrq: 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: Jiri Slaby <jslaby@suse.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f0f62c67

drivers/tty/sysrq.c

+4 −5
Original line number Diff line number Diff line
@@ -653,9 +653,9 @@ static void sysrq_parse_reset_sequence(struct sysrq_state *state) 
	state->reset_seq_version = sysrq_reset_seq_version;

}



static void sysrq_do_reset(unsigned long _state)

static void sysrq_do_reset(struct timer_list *t)

{

	struct sysrq_state *state = (struct sysrq_state *) _state;

	struct sysrq_state *state = from_timer(state, t, keyreset_timer);



	state->reset_requested = true;
@@ -672,7 +672,7 @@ static void sysrq_handle_reset_request(struct sysrq_state *state) 
		mod_timer(&state->keyreset_timer,

			jiffies + msecs_to_jiffies(sysrq_reset_downtime_ms));

	else

		sysrq_do_reset((unsigned long)state);

		sysrq_do_reset(&state->keyreset_timer);

}



static void sysrq_detect_reset_sequence(struct sysrq_state *state,
@@ -908,8 +908,7 @@ static int sysrq_connect(struct input_handler *handler, 
	sysrq->handle.handler = handler;

	sysrq->handle.name = "sysrq";

	sysrq->handle.private = sysrq;

	setup_timer(&sysrq->keyreset_timer,

		    sysrq_do_reset, (unsigned long)sysrq);

	timer_setup(&sysrq->keyreset_timer, sysrq_do_reset, 0);



	error = input_register_handle(&sysrq->handle);

	if (error) {