]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: bcm63xx_enet: Use setup_timer and mod_timer
authorHimanshu Jha <himanshujha199640@gmail.com>
Sun, 24 Sep 2017 12:11:24 +0000 (17:41 +0530)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Sep 2017 18:33:25 +0000 (11:33 -0700)
Use setup_timer and mod_timer API instead of structure assignments.

This is done using Coccinelle and semantic patch used
for this as follows:

@@
expression x,y,z,a,b;
@@

-init_timer (&x);
+setup_timer (&x, y, z);
+mod_timer (&a, b);
-x.function = y;
-x.data = z;
-x.expires = b;
-add_timer(&a);

Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/bcm63xx_enet.c

index f8bbbbfca06e0b259913518b07562a9602e92946..c6221f04a7486872c1cbf416e90fc17106e3986c 100644 (file)
@@ -2331,11 +2331,8 @@ static int bcm_enetsw_open(struct net_device *dev)
        }
 
        /* start phy polling timer */
-       init_timer(&priv->swphy_poll);
-       priv->swphy_poll.function = swphy_poll_timer;
-       priv->swphy_poll.data = (unsigned long)priv;
-       priv->swphy_poll.expires = jiffies;
-       add_timer(&priv->swphy_poll);
+       setup_timer(&priv->swphy_poll, swphy_poll_timer, (unsigned long)priv);
+       mod_timer(&priv->swphy_poll, jiffies);
        return 0;
 
 out: