ethernet/intel: Use setup_timer
authorVaishali Thakkar <vthakkar1994@gmail.com>
Mon, 1 Jun 2015 04:43:49 +0000 (10:13 +0530)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Jun 2015 04:46:01 +0000 (21:46 -0700)
Use the timer API function setup_timer instead of structure field
assignments to initialize a timer.

A simplified version of the Coccinelle semantic patch that performs
this transformation is as follows:

@change@
expression e1, e2, e3, e4, a, b;
@@

-init_timer(&e1);
+setup_timer(&e1, a, b);

... when != a = e2
    when != b = e3

-e1.function = a;
... when != b = e4
-e1.data = b;

Signed-off-by: Vaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/intel/e100.c

index 35357ae2fe7517d396e47cdc8cc77d2820b05a74..d2657a412768839145b57c656a2349cb750a146a 100644 (file)
@@ -2922,9 +2922,7 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        pci_set_master(pdev);
 
-       init_timer(&nic->watchdog);
-       nic->watchdog.function = e100_watchdog;
-       nic->watchdog.data = (unsigned long)nic;
+       setup_timer(&nic->watchdog, e100_watchdog, (unsigned long)nic);
 
        INIT_WORK(&nic->tx_timeout_task, e100_tx_timeout_task);