From: Heiner Kallweit <hkallweit1@gmail.com>
To: Realtek linux nic maintainers <nic_swsd@realtek.com>,
David Miller <davem@davemloft.net>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH net-next 4/6] r8169: change argument type of interrupt handler
Date: Sat, 24 Mar 2018 23:18:22 +0100 [thread overview]
Message-ID: <011f9eda-bcf9-83ce-7143-2acd6d8d2f57@gmail.com> (raw)
In-Reply-To: <6160c32d-3905-683a-7117-d2b11d310a34@gmail.com>
The interrupt handler doesn't need the net_device, therefore change the
argument type to struct rtl8169_private *.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index a0e32557..2d68306e 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7445,8 +7445,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 net_device *dev = dev_instance;
- struct rtl8169_private *tp = netdev_priv(dev);
+ struct rtl8169_private *tp = dev_instance;
int handled = 0;
u16 status;
@@ -7618,7 +7617,7 @@ static int rtl8169_close(struct net_device *dev)
cancel_work_sync(&tp->wk.work);
- pci_free_irq(pdev, 0, dev);
+ pci_free_irq(pdev, 0, tp);
dma_free_coherent(&pdev->dev, R8169_RX_RING_BYTES, tp->RxDescArray,
tp->RxPhyAddr);
@@ -7673,7 +7672,7 @@ static int rtl_open(struct net_device *dev)
rtl_request_firmware(tp);
- retval = pci_request_irq(pdev, 0, rtl8169_interrupt, NULL, dev,
+ retval = pci_request_irq(pdev, 0, rtl8169_interrupt, NULL, tp,
dev->name);
if (retval < 0)
goto err_release_fw_2;
--
2.16.2
next prev parent reply other threads:[~2018-03-24 22:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-24 22:11 [PATCH net-next 0/6] r8169: patch set with further smaller improvements Heiner Kallweit
2018-03-24 22:18 ` [PATCH net-next 1/6] r8169: change argument type of callback hw_start in struct rtl8169_private Heiner Kallweit
2018-03-24 22:18 ` [PATCH net-next 2/6] r8169: change argument type of counter functions Heiner Kallweit
2018-03-24 22:18 ` [PATCH net-next 3/6] r8169: change argument type of PHY-related functions Heiner Kallweit
2018-03-24 22:18 ` Heiner Kallweit [this message]
2018-03-24 22:18 ` [PATCH net-next 5/6] r8169: change type of driver_data Heiner Kallweit
2018-03-25 20:43 ` David Miller
2018-03-25 21:29 ` Heiner Kallweit
2018-03-24 22:18 ` [PATCH net-next 6/6] r8169: change argument type of rtl8169_net_suspend and __rtl8169_resume Heiner Kallweit
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=011f9eda-bcf9-83ce-7143-2acd6d8d2f57@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).