[PATCH net-next 2/4] r8169: simplify interrupt handler

[Heiner Kallweit]

Simplify the interrupt handler a little and make it better readable.

Signed-off-by: Heiner Kallweit <hkallwe...@gmail.com>
---
 drivers/net/ethernet/realtek/r8169.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/realtek/r8169.c 
b/drivers/net/ethernet/realtek/r8169.c
index 7f0975b6..fc6ae446 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -6520,20 +6520,15 @@ 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 rtl8169_private *tp = dev_instance;
-       int handled = 0;
-       u16 status;
+       u16 status = rtl_get_events(tp);
 
-       status = rtl_get_events(tp);
-       if (status && status != 0xffff) {
-               status &= RTL_EVENT_NAPI | tp->event_slow;
-               if (status) {
-                       handled = 1;
+       if (status == 0xffff || !(status & (RTL_EVENT_NAPI | tp->event_slow)))
+               return IRQ_NONE;
 
-                       rtl_irq_disable(tp);
-                       napi_schedule_irqoff(&tp->napi);
-               }
-       }
-       return IRQ_RETVAL(handled);
+       rtl_irq_disable(tp);
+       napi_schedule_irqoff(&tp->napi);
+
+       return IRQ_HANDLED;
 }
 
 /*
-- 
2.18.0