diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2018-09-25 07:58:00 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-09-25 10:28:03 -0700 |
| commit | de20e12f3faf86581e82b2826d87fbc2feec2b50 (patch) | |
| tree | 5bb27e6044cb114e9a2e903dc2f0ae8ff96a6855 | |
| parent | r8169: use default watchdog timeout (diff) | |
| download | linux-dev-de20e12f3faf86581e82b2826d87fbc2feec2b50.tar.xz linux-dev-de20e12f3faf86581e82b2826d87fbc2feec2b50.zip | |
r8169: improve rtl8169_irq_mask_and_ack
Code can be slightly simplified by acking even events we're not
interested in. In addition add a comment making clear that the
read has no functional purpose and is just a PCI commit.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index dd5822673ddb..2d9e6c186ed7 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1352,7 +1352,8 @@ static void rtl_irq_enable_all(struct rtl8169_private *tp) static void rtl8169_irq_mask_and_ack(struct rtl8169_private *tp) { rtl_irq_disable(tp); - rtl_ack_events(tp, RTL_EVENT_NAPI | tp->event_slow); + rtl_ack_events(tp, 0xffff); + /* PCI commit */ RTL_R8(tp, ChipCmd); } @@ -7365,14 +7366,12 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) rtl_init_rxcfg(tp); - rtl_irq_disable(tp); + rtl8169_irq_mask_and_ack(tp); rtl_hw_initialize(tp); rtl_hw_reset(tp); - rtl_ack_events(tp, 0xffff); - pci_set_master(pdev); rtl_init_mdio_ops(tp); |