From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH net-next 2/4] r8169: simplify interrupt handler Date: Fri, 10 Aug 2018 22:38:29 +0200 Message-ID: <51dd809a-5f41-2ab2-e19b-0bcfb0a6ba25@gmail.com> References: <1779d0ce-141f-047d-43e3-56e17e57f639@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: "netdev@vger.kernel.org" To: David Miller , Realtek linux nic maintainers Return-path: Received: from mail-wm0-f67.google.com ([74.125.82.67]:35122 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727151AbeHJXMU (ORCPT ); Fri, 10 Aug 2018 19:12:20 -0400 Received: by mail-wm0-f67.google.com with SMTP id o18-v6so3144592wmc.0 for ; Fri, 10 Aug 2018 13:40:53 -0700 (PDT) In-Reply-To: <1779d0ce-141f-047d-43e3-56e17e57f639@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: Simplify the interrupt handler a little and make it better readable. Signed-off-by: Heiner Kallweit --- 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