From: wudaemon <wudaemon@163.com>
To: davem@davemloft.net, kuba@kernel.org, m.grzeschik@pengutronix.de,
chenhao288@hisilicon.com, arnd@arndb.de
Cc: wudaemon@163.com, shenyang39@huawei.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2] net: ksz884x: use time_before in netdev_open for compatibility and remove static variable
Date: Mon, 28 Feb 2022 16:29:55 +0000 [thread overview]
Message-ID: <20220228162955.22819-1-wudaemon@163.com> (raw)
use time_before instead of direct compare for compatibility and remove the static next_jiffies variable
Signed-off-by: wudaemon <wudaemon@163.com>
---
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 d024983815da..9d445f27abb8 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];
--
2.25.1
next reply other threads:[~2022-02-28 16:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-28 16:29 wudaemon [this message]
2022-02-28 20:46 ` [PATCH v2] net: ksz884x: use time_before in netdev_open for compatibility and remove static variable Jakub Kicinski
2022-02-28 21:00 ` kernel test robot
2022-02-28 21:21 ` kernel test robot
2022-02-28 21:31 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220228162955.22819-1-wudaemon@163.com \
--to=wudaemon@163.com \
--cc=arnd@arndb.de \
--cc=chenhao288@hisilicon.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.grzeschik@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=shenyang39@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).