Skip to content

Commit

Permalink
r8169: change interrupt handler argument type
Browse files Browse the repository at this point in the history
Code can be a little simplified by switching the interrupt handler
argument type to struct rtl8169_private *.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
hkallweit authored and davem330 committed Apr 19, 2018
1 parent e71c9ce commit ebcd5da
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/net/ethernet/realtek/r8169.c
Original file line number Diff line number Diff line change
Expand Up @@ -7432,8 +7432,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;

Expand Down Expand Up @@ -7605,7 +7604,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);
Expand Down Expand Up @@ -7660,7 +7659,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;
Expand Down

0 comments on commit ebcd5da

Please sign in to comment.