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>

diff --git a/arch/sparc/kernel/led.c b/arch/sparc/kernel/led.c
index e278bf52963b58e834ca21015ac59c2a84fe6ec0..519f5ba7ed7e7e61609c3f4d2ed20d9fc56a23ba 100644 (file)
--- a/arch/sparc/kernel/led.c
+++ b/arch/sparc/kernel/led.c
@@ -31,19 +31,20 @@ static inline void led_toggle(void)
 }
 
 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();
 
        /* reschedule */
        if (!timeout) { /* blink according to load */
                led_blink_timer.expires = jiffies +
                        ((1 + (avenrun[0] >> FSHIFT)) * HZ);
-               led_blink_timer.data = 0;
        } else { /* blink at user specified interval */
                led_blink_timer.expires = jiffies + (timeout * HZ);
-               led_blink_timer.data = timeout;
        }
        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")) {
                led_toggle();
        } 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")) {
-               led_blink(0);
+               led_blink_timer_timeout = 0;
+               led_blink(&led_blink_timer);
        } else {
                auxio_set_led(AUXIO_LED_OFF);
        }
@@ -115,8 +118,7 @@ static struct proc_dir_entry *led;
 
 static int __init led_init(void)
 {
-       init_timer(&led_blink_timer);
-       led_blink_timer.function = led_blink;
+       timer_setup(&led_blink_timer, led_blink, 0);
 
        led = proc_create("led", 0, NULL, &led_proc_fops);
        if (!led)