netdev - [PATCH 31/64] drivers: net: e1000e: use setup

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1506013525-29291-32-git-send-email-allen.lkml@gmail.com>
Date:   Thu, 21 Sep 2017 22:34:52 +0530
From:   Allen Pais <allen.lkml@...il.com>
To:     netdev@...r.kernel.org
Cc:     linux-kernel@...r.kernel.org, m.grzeschik@...gutronix.de,
        dmitry.tarnyagin@...kless.no, wg@...ndegger.com,
        mkl@...gutronix.de, mark.einon@...il.com, linux@...linux.org.uk,
        pcnet32@...ntier.com, f.fainelli@...il.com,
        bcm-kernel-feedback-list@...adcom.com, venza@...wnhat.org,
        ajk@...nets.uni-bremen.de, jes@...ined-monkey.org,
        romieu@...zoreil.com, khc@...waw.pl, simon@...kelleys.org.uk,
        davem@...emloft.net, linux-can@...r.kernel.org,
        adi-buildroot-devel@...ts.sourceforge.net,
        Allen Pais <allen.lkml@...il.com>
Subject: [PATCH 31/64] drivers: net: e1000e: 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@...il.com>
---
 drivers/net/ethernet/intel/e1000e/netdev.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 327dfe5..8436c5f 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -7252,13 +7252,10 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 		goto err_eeprom;
 	}
 
-	init_timer(&adapter->watchdog_timer);
-	adapter->watchdog_timer.function = e1000_watchdog;
-	adapter->watchdog_timer.data = (unsigned long)adapter;
-
-	init_timer(&adapter->phy_info_timer);
-	adapter->phy_info_timer.function = e1000_update_phy_info;
-	adapter->phy_info_timer.data = (unsigned long)adapter;
+	setup_timer(&adapter->watchdog_timer, e1000_watchdog,
+		    (unsigned long)adapter);
+	setup_timer(&adapter->phy_info_timer, e1000_update_phy_info,
+		    (unsigned long)adapter);
 
 	INIT_WORK(&adapter->reset_task, e1000_reset_task);
 	INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task);
-- 
2.7.4