drivers/macintosh: 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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Kees Cook <keescook@chromium.org>

diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index ea9bdc85a21dedc4a62d1fe3845d7366452c4d13..899ec1f4c83368919b76bcb0ed0b599015b706c8 100644 (file)
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -103,7 +103,7 @@ static DEFINE_MUTEX(smu_part_access);
 static int smu_irq_inited;
 static unsigned long smu_cmdbuf_abs;
 
-static void smu_i2c_retry(unsigned long data);
+static void smu_i2c_retry(struct timer_list *t);
 
 /*
  * SMU driver low level stuff
@@ -582,9 +582,7 @@ static int smu_late_init(void)
        if (!smu)
                return 0;
 
-       init_timer(&smu->i2c_timer);
-       smu->i2c_timer.function = smu_i2c_retry;
-       smu->i2c_timer.data = (unsigned long)smu;
+       timer_setup(&smu->i2c_timer, smu_i2c_retry, 0);
 
        if (smu->db_node) {
                smu->db_irq = irq_of_parse_and_map(smu->db_node, 0);
@@ -755,7 +753,7 @@ static void smu_i2c_complete_command(struct smu_i2c_cmd *cmd, int fail)
 }
 
 
-static void smu_i2c_retry(unsigned long data)
+static void smu_i2c_retry(struct timer_list *unused)
 {
        struct smu_i2c_cmd      *cmd = smu->cmd_i2c_cur;
 
@@ -795,7 +793,7 @@ static void smu_i2c_low_completion(struct smu_cmd *scmd, void *misc)
                BUG_ON(cmd != smu->cmd_i2c_cur);
                if (!smu_irq_inited) {
                        mdelay(5);
-                       smu_i2c_retry(0);
+                       smu_i2c_retry(NULL);
                        return;
                }
                mod_timer(&smu->i2c_timer, jiffies + msecs_to_jiffies(5));