From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH net-next 4/6] r8169: change argument type of interrupt handler Date: Sat, 24 Mar 2018 23:18:22 +0100 Message-ID: <011f9eda-bcf9-83ce-7143-2acd6d8d2f57@gmail.com> References: <6160c32d-3905-683a-7117-d2b11d310a34@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: "netdev@vger.kernel.org" To: Realtek linux nic maintainers , David Miller Return-path: Received: from mail-wr0-f196.google.com ([209.85.128.196]:41729 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752548AbeCXWSm (ORCPT ); Sat, 24 Mar 2018 18:18:42 -0400 Received: by mail-wr0-f196.google.com with SMTP id f14so15346808wre.8 for ; Sat, 24 Mar 2018 15:18:42 -0700 (PDT) In-Reply-To: <6160c32d-3905-683a-7117-d2b11d310a34@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: The interrupt handler doesn't need the net_device, therefore change the argument type to struct rtl8169_private *. Signed-off-by: Heiner Kallweit --- 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