OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparc/led: 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. Adds a static variable to hold timeout
value.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geliang Tang <geliangtang@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: sparclinux@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kees Cook 2017-10-10 15:07:27 -07:00 committed by David S. Miller
parent a16036e9b2
commit 68fa10dce0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/sparc/kernel/led.c
View File

@ -31,19 +31,20 @@ static inline void led_toggle(void)
} }
static struct timer_list led_blink_timer; static struct timer_list led_blink_timer;
static unsigned long led_blink_timer_timeout;
static void led_blink(unsigned long timeout) static void led_blink(struct timer_list *unused)
{ {
unsigned long timeout = led_blink_timer_timeout;
led_toggle(); led_toggle();
/* reschedule */ /* reschedule */
if (!timeout) { /* blink according to load */ if (!timeout) { /* blink according to load */
led_blink_timer.expires = jiffies + led_blink_timer.expires = jiffies +
((1 + (avenrun[0] >> FSHIFT)) * HZ); ((1 + (avenrun[0] >> FSHIFT)) * HZ);
led_blink_timer.data = 0;
} else { /* blink at user specified interval */ } else { /* blink at user specified interval */
led_blink_timer.expires = jiffies + (timeout * HZ); led_blink_timer.expires = jiffies + (timeout * HZ);
led_blink_timer.data = timeout;
} }
add_timer(&led_blink_timer); add_timer(&led_blink_timer);
} }
@ -88,9 +89,11 @@ static ssize_t led_proc_write(struct file *file, const char __user *buffer,
} else if (!strcmp(buf, "toggle")) { } else if (!strcmp(buf, "toggle")) {
led_toggle(); led_toggle();
} else if ((*buf > '0') && (*buf <= '9')) { } else if ((*buf > '0') && (*buf <= '9')) {
led_blink(simple_strtoul(buf, NULL, 10)); led_blink_timer_timeout = simple_strtoul(buf, NULL, 10);
led_blink(&led_blink_timer);
} else if (!strcmp(buf, "load")) { } else if (!strcmp(buf, "load")) {
led_blink(0); led_blink_timer_timeout = 0;
led_blink(&led_blink_timer);
} else { } else {
auxio_set_led(AUXIO_LED_OFF); auxio_set_led(AUXIO_LED_OFF);
} }
@ -115,8 +118,7 @@ static struct proc_dir_entry *led;
static int __init led_init(void) static int __init led_init(void)
{ {
init_timer(&led_blink_timer); timer_setup(&led_blink_timer, led_blink, 0);
led_blink_timer.function = led_blink;
led = proc_create("led", 0, NULL, &led_proc_fops); led = proc_create("led", 0, NULL, &led_proc_fops);
if (!led) if (!led)