From: Allen Pais <allen.lkml@gmail.com>
Date: Thu, 21 Sep 2017 17:04:26 +0000 (+0530)
Subject: drivers : net: niu: use setup_timer() helper.
X-Git-Tag: android-x86-8.1-r1~2235^2~675^2~59
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ba4cc08793a58a97cffc2769acaa53fff4433332;p=android-x86%2Fkernel.git

drivers : net: niu: use setup_timer() helper.

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: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 6a4e8e1bbd90..bde19b307d0d 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -6123,10 +6123,8 @@ static int niu_open(struct net_device *dev)
 
 	err = niu_init_hw(np);
 	if (!err) {
-		init_timer(&np->timer);
+		setup_timer(&np->timer, niu_timer, (unsigned long)np);
 		np->timer.expires = jiffies + HZ;
-		np->timer.data = (unsigned long) np;
-		np->timer.function = niu_timer;
 
 		err = niu_enable_interrupts(np, 1);
 		if (err)