netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net, pabeni@redhat.com
Cc: netdev@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>,
	steve.glendinning@shawell.net, david.kershner@unisys.com,
	gregkh@linuxfoundation.org, liujunqi@pku.edu.cn,
	sparmaintainer@unisys.com, linux-staging@lists.linux.dev
Subject: [PATCH net-next 02/14] eth: remove NAPI_WEIGHT defines
Date: Wed, 27 Apr 2022 08:40:59 -0700	[thread overview]
Message-ID: <20220427154111.529975-3-kuba@kernel.org> (raw)
In-Reply-To: <20220427154111.529975-1-kuba@kernel.org>

Defining local versions of NAPI_POLL_WEIGHT with the same
values in the drivers just makes refactoring harder.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: steve.glendinning@shawell.net
CC: david.kershner@unisys.com
CC: gregkh@linuxfoundation.org
CC: liujunqi@pku.edu.cn
CC: sparmaintainer@unisys.com
CC: linux-staging@lists.linux.dev
---
 drivers/net/ethernet/smsc/smsc9420.c            | 2 +-
 drivers/net/ethernet/smsc/smsc9420.h            | 1 -
 drivers/staging/unisys/visornic/visornic_main.c | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
index d937af18973e..0c68c7f8056d 100644
--- a/drivers/net/ethernet/smsc/smsc9420.c
+++ b/drivers/net/ethernet/smsc/smsc9420.c
@@ -1585,7 +1585,7 @@ smsc9420_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	dev->netdev_ops = &smsc9420_netdev_ops;
 	dev->ethtool_ops = &smsc9420_ethtool_ops;
 
-	netif_napi_add(dev, &pd->napi, smsc9420_rx_poll, NAPI_WEIGHT);
+	netif_napi_add(dev, &pd->napi, smsc9420_rx_poll, NAPI_POLL_WEIGHT);
 
 	result = register_netdev(dev);
 	if (result) {
diff --git a/drivers/net/ethernet/smsc/smsc9420.h b/drivers/net/ethernet/smsc/smsc9420.h
index 409e82b2018a..876410a256c6 100644
--- a/drivers/net/ethernet/smsc/smsc9420.h
+++ b/drivers/net/ethernet/smsc/smsc9420.h
@@ -15,7 +15,6 @@
 /* interrupt deassertion in multiples of 10us */
 #define INT_DEAS_TIME			(50)
 
-#define NAPI_WEIGHT			(64)
 #define SMSC_BAR			(3)
 
 #ifdef __BIG_ENDIAN
diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c
index 643432458105..81ac3ac05192 100644
--- a/drivers/staging/unisys/visornic/visornic_main.c
+++ b/drivers/staging/unisys/visornic/visornic_main.c
@@ -26,7 +26,6 @@
  *         = 163840 bytes
  */
 #define MAX_BUF 163840
-#define NAPI_WEIGHT 64
 
 /* GUIDS for director channel type supported by this driver.  */
 /* {8cd5994d-c58e-11da-95a9-00e08161165f} */
@@ -1884,7 +1883,8 @@ static int visornic_probe(struct visor_device *dev)
 
 	/* TODO: Setup Interrupt information */
 	/* Let's start our threads to get responses */
-	netif_napi_add(netdev, &devdata->napi, visornic_poll, NAPI_WEIGHT);
+	netif_napi_add(netdev, &devdata->napi, visornic_poll,
+		       NAPI_POLL_WEIGHT);
 
 	channel_offset = offsetof(struct visor_io_channel,
 				  channel_header.features);
-- 
2.34.1


  parent reply	other threads:[~2022-04-27 15:41 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-27 15:40 [PATCH net-next 00/14] remove copies of the NAPI_POLL_WEIGHT define Jakub Kicinski
2022-04-27 15:40 ` [PATCH net-next 01/14] eth: " Jakub Kicinski
2022-05-01 22:10   ` Linus Walleij
2022-04-27 15:40 ` Jakub Kicinski [this message]
2022-04-27 17:41   ` [PATCH net-next 02/14] eth: remove NAPI_WEIGHT defines Greg KH
2022-04-27 15:41 ` [PATCH net-next 03/14] eth: cpsw: remove a copy of the NAPI_POLL_WEIGHT define Jakub Kicinski
2022-04-27 15:47   ` Vladimir Oltean
2022-04-27 15:53     ` Jakub Kicinski
2022-04-27 21:06       ` Francois Romieu
2022-04-27 15:41 ` [PATCH net-next 04/14] eth: pch_gbe: " Jakub Kicinski
2022-04-28  9:57   ` Andy Shevchenko
2022-04-27 15:41 ` [PATCH net-next 05/14] eth: mtk_eth_soc: " Jakub Kicinski
2022-04-27 15:41 ` [PATCH net-next 06/14] usb: lan78xx: " Jakub Kicinski
2022-04-27 15:41 ` [PATCH net-next 07/14] slic: " Jakub Kicinski
2022-04-27 15:41 ` [PATCH net-next 08/14] eth: bgnet: " Jakub Kicinski
2022-04-27 16:09   ` Florian Fainelli
2022-04-27 16:53     ` Jakub Kicinski
2022-04-27 17:32       ` Florian Fainelli
2022-04-27 15:41 ` [PATCH net-next 09/14] eth: atlantic: " Jakub Kicinski
2022-04-27 15:41 ` [PATCH net-next 10/14] eth: benet: " Jakub Kicinski
2022-04-27 15:41 ` [PATCH net-next 11/14] eth: gfar: " Jakub Kicinski
2022-04-27 15:41 ` [PATCH net-next 12/14] eth: vxge: " Jakub Kicinski
2022-04-27 15:41 ` [PATCH net-next 13/14] eth: spider: " Jakub Kicinski
2022-04-27 21:56   ` Geoff Levand
2022-04-27 15:41 ` [PATCH net-next 14/14] eth: velocity: " Jakub Kicinski

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=20220427154111.529975-3-kuba@kernel.org \
    --to=kuba@kernel.org \
    --cc=davem@davemloft.net \
    --cc=david.kershner@unisys.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=liujunqi@pku.edu.cn \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=sparmaintainer@unisys.com \
    --cc=steve.glendinning@shawell.net \
    /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).