Skip to content

Commit ebcd5da

Browse files
hkallweitdavem330
authored andcommitted
r8169: change interrupt handler argument type
Code can be a little simplified by switching the interrupt handler argument type to struct rtl8169_private *. Signed-off-by: Heiner Kallweit <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent e71c9ce commit ebcd5da

File tree

1 file changed

+3
-4
lines changed
  • drivers/net/ethernet/realtek

1 file changed

+3
-4
lines changed

drivers/net/ethernet/realtek/r8169.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7432,8 +7432,7 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget
74327432

74337433
static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
74347434
{
7435-
struct net_device *dev = dev_instance;
7436-
struct rtl8169_private *tp = netdev_priv(dev);
7435+
struct rtl8169_private *tp = dev_instance;
74377436
int handled = 0;
74387437
u16 status;
74397438

@@ -7605,7 +7604,7 @@ static int rtl8169_close(struct net_device *dev)
76057604

76067605
cancel_work_sync(&tp->wk.work);
76077606

7608-
pci_free_irq(pdev, 0, dev);
7607+
pci_free_irq(pdev, 0, tp);
76097608

76107609
dma_free_coherent(&pdev->dev, R8169_RX_RING_BYTES, tp->RxDescArray,
76117610
tp->RxPhyAddr);
@@ -7660,7 +7659,7 @@ static int rtl_open(struct net_device *dev)
76607659

76617660
rtl_request_firmware(tp);
76627661

7663-
retval = pci_request_irq(pdev, 0, rtl8169_interrupt, NULL, dev,
7662+
retval = pci_request_irq(pdev, 0, rtl8169_interrupt, NULL, tp,
76647663
dev->name);
76657664
if (retval < 0)
76667665
goto err_release_fw_2;

0 commit comments

Comments
 (0)