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 v2 1/8] r8169: remove rtl_get_events
Date: Sat, 19 Jan 2019 22:02:40 +0100 [thread overview]
Message-ID: <c1c6826d-4af6-40db-07ae-465fb1cfc80e@gmail.com> (raw)
In-Reply-To: <efa9d921-1190-62b9-4515-b38d7f5564cd@gmail.com>
This helper is used only once, so remove it.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index abb94c543..b2e30e302 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -1278,11 +1278,6 @@ static u8 rtl8168d_efuse_read(struct rtl8169_private *tp, int reg_addr)
RTL_R32(tp, EFUSEAR) & EFUSEAR_DATA_MASK : ~0;
}
-static u16 rtl_get_events(struct rtl8169_private *tp)
-{
- return RTL_R16(tp, IntrStatus);
-}
-
static void rtl_ack_events(struct rtl8169_private *tp, u16 bits)
{
RTL_W16(tp, IntrStatus, bits);
@@ -6409,7 +6404,7 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget
static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
{
struct rtl8169_private *tp = dev_instance;
- u16 status = rtl_get_events(tp);
+ u16 status = RTL_R16(tp, IntrStatus);
u16 irq_mask = RTL_R16(tp, IntrMask);
if (status == 0xffff || !(status & irq_mask))
--
2.20.1
next prev parent reply other threads:[~2019-01-19 21:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-19 21:01 [PATCH net-next v2 0/8] r8169: series with smaller improvements Heiner Kallweit
2019-01-19 21:02 ` Heiner Kallweit [this message]
2019-01-19 21:03 ` [PATCH net-next v2 2/8] r8169: remove unneeded call in pcierr Heiner Kallweit
2019-01-19 21:03 ` [PATCH net-next v2 3/8] r8169: initialize task workqueue only once Heiner Kallweit
2019-01-19 21:05 ` [PATCH net-next v2 4/8] r8169: improve rtl_pcie_state_l2l3_enable Heiner Kallweit
2019-01-19 21:05 ` [PATCH net-next v2 5/8] r8169: add helpers for locking / unlocking the config registers Heiner Kallweit
2019-01-19 21:06 ` [PATCH net-next v2 6/8] r8169: reset chip synchronously in __rtl8169_resume Heiner Kallweit
2019-01-19 21:07 ` [PATCH net-next v2 7/8] r8169: replace mii_bus member with phy_device member in struct rtl8169_private Heiner Kallweit
2019-01-19 21:07 ` [PATCH net-next v2 8/8] r8169: factor out getting ether_clk Heiner Kallweit
2019-01-20 0:09 ` [PATCH net-next v2 0/8] r8169: series with smaller improvements 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=c1c6826d-4af6-40db-07ae-465fb1cfc80e@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).