From 5db9da911f33045f8dd202d40c20530211b48af0 Mon Sep 17 00:00:00 2001 From: wudaemon Date: Mon, 28 Feb 2022 16:29:55 +0000 Subject: [PATCH] net: ksz884x: use time_before in netdev_open for compatibility and remove static variable use time_before instead of direct compare for compatibility and remove the static next_jiffies variable Signed-off-by: wudaemon --- drivers/net/ethernet/micrel/ksz884x.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c index d024983815da7b..9d445f27abb8cd 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/drivers/net/ethernet/micrel/ksz884x.c @@ -5225,7 +5225,6 @@ static irqreturn_t netdev_intr(int irq, void *dev_id) * Linux network device functions */ -static unsigned long next_jiffies; #ifdef CONFIG_NET_POLL_CONTROLLER static void netdev_netpoll(struct net_device *dev) @@ -5361,7 +5360,7 @@ static int prepare_hardware(struct net_device *dev) struct dev_info *hw_priv = priv->adapter; struct ksz_hw *hw = &hw_priv->hw; int rc = 0; - + unsigned long next_jiffies = 0; /* Remember the network device that requests interrupts. */ hw_priv->dev = dev; rc = request_irq(dev->irq, netdev_intr, IRQF_SHARED, dev->name, dev); @@ -5428,7 +5427,7 @@ static int netdev_open(struct net_device *dev) if (rc) return rc; for (i = 0; i < hw->mib_port_cnt; i++) { - if (next_jiffies < jiffies) + if (time_before(next_jiffies, jiffies)) next_jiffies = jiffies + HZ * 2; else next_jiffies += HZ * 1; @@ -6566,7 +6565,7 @@ static void mib_read_work(struct work_struct *work) struct ksz_port_mib *mib; int i; - next_jiffies = jiffies; + unsigned long next_jiffies = jiffies; for (i = 0; i < hw->mib_port_cnt; i++) { mib = &hw->port_mib[i];