Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 605ea2f9 authored by Kees Cook's avatar Kees Cook Committed by David S. Miller
Browse files

drivers/net: wan/lmc: 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: netdev@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e2009be0

drivers/net/wan/lmc/lmc_main.c

+5 −5
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static void lmc_initcsrs(lmc_softc_t * const sc, lmc_csrptr_t csr_base, size_t c 
static void lmc_softreset(lmc_softc_t * const);

static void lmc_running_reset(struct net_device *dev);

static int lmc_ifdown(struct net_device * const);

static void lmc_watchdog(unsigned long data);

static void lmc_watchdog(struct timer_list *t);

static void lmc_reset(lmc_softc_t * const sc);

static void lmc_dec_reset(lmc_softc_t * const sc);

static void lmc_driver_timeout(struct net_device *dev);
@@ -636,10 +636,10 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ 




/* the watchdog process that cruises around */

static void lmc_watchdog (unsigned long data) /*fold00*/

static void lmc_watchdog(struct timer_list *t) /*fold00*/

{

    struct net_device *dev = (struct net_device *)data;

    lmc_softc_t *sc = dev_to_sc(dev);

    lmc_softc_t *sc = from_timer(sc, t, timer);

    struct net_device *dev = sc->lmc_device;

    int link_status;

    u32 ticks;

    unsigned long flags;
@@ -1084,7 +1084,7 @@ static int lmc_open(struct net_device *dev) 
     * Setup a timer for the watchdog on probe, and start it running.

     * Since lmc_ok == 0, it will be a NOP for now.

     */

    setup_timer(&sc->timer, lmc_watchdog, (unsigned long)dev);

    timer_setup(&sc->timer, lmc_watchdog, 0);

    sc->timer.expires = jiffies + HZ;

    add_timer (&sc->timer);