drivers/net: wan/sdla: 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: Allen Pais <allen.lkml@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Tobias Klauser <tklauser@distanz.ch>
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 0cc48902dbb9c5b753409507dd6eb441bd953322..57ed259c8208d32474912a144e735cae74992fe6 100644 (file)
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -927,13 +927,10 @@ static irqreturn_t sdla_isr(int dummy, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static void sdla_poll(unsigned long device)
+static void sdla_poll(struct timer_list *t)
 {
-       struct net_device         *dev;
-       struct frad_local *flp;
-
-       dev = (struct net_device *) device;
-       flp = netdev_priv(dev);
+       struct frad_local *flp = from_timer(flp, t, timer);
+       struct net_device *dev = flp->dev;
 
        if (sdla_byte(dev, SDLA_502_RCV_BUF))
                sdla_receive(dev);
@@ -1616,8 +1613,9 @@ static void setup_sdla(struct net_device *dev)
        flp->assoc              = sdla_assoc;
        flp->deassoc            = sdla_deassoc;
        flp->dlci_conf          = sdla_dlci_conf;
+       flp->dev                = dev;
 
-       setup_timer(&flp->timer, sdla_poll, (unsigned long)dev);
+       timer_setup(&flp->timer, sdla_poll, 0);
        flp->timer.expires      = 1;
 }
 

diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index 46df7e565d6f88f4b99137b4353bd5046f4f2076..82a1b4e9357091dc0c1e2bda70e73e72ea3a02e6 100644 (file)
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -83,6 +83,7 @@ struct frad_local
 
    /* fields that are used by the Sangoma SDLA cards */
    struct timer_list timer;
+   struct net_device *dev;
    int               type;             /* adapter type */
    int               state;            /* state of the S502/8 control latch */
    int               buffer;           /* current buffer for S508 firmware */