Merge branch 'for-4.3/gembird' into for-linus

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index 1a450f4b6b12..d2657a412768 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -874,7 +874,7 @@ static int e100_exec_cb(struct nic *nic, struct sk_buff *skb,
 {
         struct cb *cb;
         unsigned long flags;
-        int err = 0;
+        int err;
 
         spin_lock_irqsave(&nic->cb_lock, flags);
 
@@ -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);