OSDN Git Service

drivers: net: amd8111e: use setup_timer() helper.
authorAllen Pais <allen.lkml@gmail.com>
Thu, 21 Sep 2017 17:04:54 +0000 (22:34 +0530)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Sep 2017 18:44:41 +0000 (11:44 -0700)
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>
drivers/net/ethernet/amd/amd8111e.c

index 7b5df56..7f22af6 100644 (file)
@@ -1883,9 +1883,8 @@ static int amd8111e_probe_one(struct pci_dev *pdev,
 
        /* Initialize software ipg timer */
        if(lp->options & OPTION_DYN_IPG_ENABLE){
-               init_timer(&lp->ipg_data.ipg_timer);
-               lp->ipg_data.ipg_timer.data = (unsigned long) dev;
-               lp->ipg_data.ipg_timer.function = (void *)&amd8111e_config_ipg;
+               setup_timer(&lp->ipg_data.ipg_timer,
+                           (void *)&amd8111e_config_ipg, (unsigned long)dev);
                lp->ipg_data.ipg_timer.expires = jiffies +
                                                 IPG_CONVERGE_JIFFIES;
                lp->ipg_data.ipg = DEFAULT_IPG;