netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Heiner Kallweit <hkallweit1@gmail.com>
To: David Miller <davem@davemloft.net>,
	Realtek linux nic maintainers <nic_swsd@realtek.com>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH net-next 3/8] r8169: replace magic number for INTT mask with a constant
Date: Sat, 28 Apr 2018 22:19:21 +0200	[thread overview]
Message-ID: <88ab29d4-456f-1ce4-6957-153c1eb03677@gmail.com> (raw)
In-Reply-To: <9b5f541e-8725-46ca-4466-0c3295229252@gmail.com>

Use a proper constant for INTT bit mask.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/ethernet/realtek/r8169.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 411d12be..1dd189dd 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -599,6 +599,7 @@ enum rtl_register_content {
 	RxChkSum	= (1 << 5),
 	PCIDAC		= (1 << 4),
 	PCIMulRW	= (1 << 3),
+#define INTT_MASK	GENMASK(1, 0)
 	INTT_0		= 0x0000,	// 8168
 	INTT_1		= 0x0001,	// 8168
 	INTT_2		= 0x0002,	// 8168
@@ -2344,7 +2345,7 @@ static int rtl_get_coalesce(struct net_device *dev, struct ethtool_coalesce *ec)
 	if (IS_ERR(ci))
 		return PTR_ERR(ci);
 
-	scale = &ci->scalev[RTL_R16(tp, CPlusCmd) & 3];
+	scale = &ci->scalev[RTL_R16(tp, CPlusCmd) & INTT_MASK];
 
 	/* read IntrMitigate and adjust according to scale */
 	for (w = RTL_R16(tp, IntrMitigate); w; w >>= RTL_COALESCE_SHIFT, p++) {
@@ -2443,7 +2444,7 @@ static int rtl_set_coalesce(struct net_device *dev, struct ethtool_coalesce *ec)
 
 	RTL_W16(tp, IntrMitigate, swab16(w));
 
-	tp->cp_cmd = (tp->cp_cmd & ~3) | cp01;
+	tp->cp_cmd = (tp->cp_cmd & ~INTT_MASK) | cp01;
 	RTL_W16(tp, CPlusCmd, tp->cp_cmd);
 	RTL_R16(tp, CPlusCmd);
 
-- 
2.17.0

  parent reply	other threads:[~2018-04-28 20:19 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-28 20:06 [PATCH net-next 0/8] r8169: further improvements w/o functional change Heiner Kallweit
2018-04-28 20:19 ` [PATCH net-next 1/8] r8169: remove unneeded call to __rtl8169_set_features in rtl_open Heiner Kallweit
2018-04-28 20:19 ` [PATCH net-next 2/8] r8169: improve rtl8169_set_features Heiner Kallweit
2018-04-28 20:19 ` Heiner Kallweit [this message]
2018-04-28 20:19 ` [PATCH net-next 4/8] r8169: improve CPlusCmd handling Heiner Kallweit
2018-04-28 20:19 ` [PATCH net-next 5/8] r8169: improve handling of CPCMD quirk mask Heiner Kallweit
2018-04-28 20:19 ` [PATCH net-next 6/8] r8169: simplify rtl_hw_start_8169 Heiner Kallweit
2018-04-28 20:19 ` [PATCH net-next 7/8] r8169: remove calls to rtl_set_rx_mode Heiner Kallweit
2018-04-28 20:19 ` [PATCH net-next 8/8] r8169: move common initializations to tp->hw_start Heiner Kallweit
2018-04-30 13:39 ` [PATCH net-next 0/8] r8169: further improvements w/o functional change David Miller

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=88ab29d4-456f-1ce4-6957-153c1eb03677@gmail.com \
    --to=hkallweit1@gmail.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=nic_swsd@realtek.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).