powerpc/powermac: Use setup_timer() helper
authorAllen Pais <allen.lkml@gmail.com>
Fri, 22 Sep 2017 11:35:00 +0000 (17:05 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 4 Oct 2017 00:28:02 +0000 (11:28 +1100)
Use setup_timer function instead of initializing timer with the
function and data fields.

Signed-off-by: Allen Pais <allen.lkml@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/platforms/powermac/low_i2c.c

index 70183eb3d5c89761c541672175ffaad1993c5982..39a1d4225e0f7c114701e8550b073eb3aabd647d 100644 (file)
@@ -513,9 +513,7 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np)
        mutex_init(&host->mutex);
        init_completion(&host->complete);
        spin_lock_init(&host->lock);
-       init_timer(&host->timeout_timer);
-       host->timeout_timer.function = kw_i2c_timeout;
-       host->timeout_timer.data = (unsigned long)host;
+       setup_timer(&host->timeout_timer, kw_i2c_timeout, (unsigned long)host);
 
        psteps = of_get_property(np, "AAPL,address-step", NULL);
        steps = psteps ? (*psteps) : 0x10;