Skip to contentSkip to conversation

e1000e: Make watchdog use delayed work

PATCH In review Detlev Casanova 2 participants 2 messages Jun 23, 2019 – Jun 28, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 e1000e: Make watchdog use delayed work

Use delayed work instead of timers to run the watchdog of the e1000e driver.

Simplify the code with one less middle function.

---
 drivers/net/ethernet/intel/e1000e/e1000.h  |  5 +-
 drivers/net/ethernet/intel/e1000e/netdev.c | 54 ++++++++++++----------
 2 files changed, 32 insertions(+), 27 deletions(-)
drivers/net/ethernet/intel/e1000e/e1000.h +3 -2
index be13227f1697..34cd67951aec 100644
@@ -186,12 +186,13 @@ struct e1000_phy_regs {
 
 /* board specific private data structure */
 struct e1000_adapter {
-	struct timer_list watchdog_timer;
 	struct timer_list phy_info_timer;
 	struct timer_list blink_timer;
 
 	struct work_struct reset_task;
-	struct work_struct watchdog_task;
+	struct delayed_work watchdog_task;
+
+	struct workqueue_struct *e1000_workqueue;
 
 	const struct e1000_info *ei;
 
drivers/net/ethernet/intel/e1000e/netdev.c +29 -25

122 lines not on this page · raw message

Signature · 1 line
2.22.0
Tested-by on v3 1/1
#1 lore raw
Quoted 12 lines

From: netdev-owner at vger.kernel.org [mailto:netdev-owner at vger.kernel.org] On Behalf Of Detlev Casanova
Sent: Saturday, June 22, 2019 8:15 PM
To: Kirsher, Jeffrey T <[email protected]>; David S. Miller <[email protected]>; intel-wired-lan at lists.osuosl.org; netdev at vger.kernel.org; linux-kernel at vger.kernel.org
Cc: Detlev Casanova <[email protected]>
Subject: [PATCH v3] e1000e: Make watchdog use delayed work

Use delayed work instead of timers to run the watchdog of the e1000e driver.

Quoted 7 lines

Simplify the code with one less middle function.

---
 drivers/net/ethernet/intel/e1000e/e1000.h  |  5 +-
 drivers/net/ethernet/intel/e1000e/netdev.c | 54 ++++++++++++----------
 2 files changed, 32 insertions(+), 27 deletions(-)