forked from luck/tmp_suning_uos_patched
drivers/net: nuvoton: 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: Wan ZongShun <mcuos.com@gmail.com> Cc: linux-arm-kernel@lists.infradead.org Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3248f77fa3
commit
97815186d4
|
@ -253,10 +253,10 @@ static void update_linkspeed(struct net_device *dev)
|
|||
netif_carrier_on(dev);
|
||||
}
|
||||
|
||||
static void w90p910_check_link(unsigned long dev_id)
|
||||
static void w90p910_check_link(struct timer_list *t)
|
||||
{
|
||||
struct net_device *dev = (struct net_device *) dev_id;
|
||||
struct w90p910_ether *ether = netdev_priv(dev);
|
||||
struct w90p910_ether *ether = from_timer(ether, t, check_timer);
|
||||
struct net_device *dev = ether->mii.dev;
|
||||
|
||||
update_linkspeed(dev);
|
||||
mod_timer(ðer->check_timer, jiffies + msecs_to_jiffies(1000));
|
||||
|
@ -957,8 +957,7 @@ static int w90p910_ether_setup(struct net_device *dev)
|
|||
ether->mii.mdio_read = w90p910_mdio_read;
|
||||
ether->mii.mdio_write = w90p910_mdio_write;
|
||||
|
||||
setup_timer(ðer->check_timer, w90p910_check_link,
|
||||
(unsigned long)dev);
|
||||
timer_setup(ðer->check_timer, w90p910_check_link, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user