From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH net-next 01/11] r8169: merge rtl_irq_enable and rtl_irq_enable_all Date: Mon, 19 Nov 2018 22:31:32 +0100 Message-ID: <5cb71740-e6e4-2230-4fa6-2bcacd40ff6b@gmail.com> References: <7484b166-100b-52b9-1539-22e9199a8a3a@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-wm1-f65.google.com ([209.85.128.65]:52519 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731047AbeKTIHa (ORCPT ); Tue, 20 Nov 2018 03:07:30 -0500 Received: by mail-wm1-f65.google.com with SMTP id r11-v6so195165wmb.2 for ; Mon, 19 Nov 2018 13:41:52 -0800 (PST) In-Reply-To: <7484b166-100b-52b9-1539-22e9199a8a3a@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: After the recent changes to the interrupt handler rtl_irq_enable and rtl_irq_enable_all can be merged. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 100731c86..ff85f0282 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1334,18 +1334,13 @@ static void rtl_irq_disable(struct rtl8169_private *tp) mmiowb(); } -static void rtl_irq_enable(struct rtl8169_private *tp, u16 bits) -{ - RTL_W16(tp, IntrMask, bits); -} - #define RTL_EVENT_NAPI_RX (RxOK | RxErr) #define RTL_EVENT_NAPI_TX (TxOK | TxErr) #define RTL_EVENT_NAPI (RTL_EVENT_NAPI_RX | RTL_EVENT_NAPI_TX) -static void rtl_irq_enable_all(struct rtl8169_private *tp) +static void rtl_irq_enable(struct rtl8169_private *tp) { - rtl_irq_enable(tp, RTL_EVENT_NAPI | tp->event_slow); + RTL_W16(tp, IntrMask, RTL_EVENT_NAPI | tp->event_slow); } static void rtl8169_irq_mask_and_ack(struct rtl8169_private *tp) @@ -4643,7 +4638,7 @@ static void rtl_hw_start(struct rtl8169_private *tp) rtl_set_rx_mode(tp->dev); /* no early-rx interrupts */ RTL_W16(tp, MultiIntr, RTL_R16(tp, MultiIntr) & 0xf000); - rtl_irq_enable_all(tp); + rtl_irq_enable(tp); } static void rtl_hw_start_8169(struct rtl8169_private *tp) @@ -6533,7 +6528,7 @@ static int rtl8169_poll(struct napi_struct *napi, int budget) if (work_done < budget) { napi_complete_done(napi, work_done); - rtl_irq_enable_all(tp); + rtl_irq_enable(tp); mmiowb(); } -- 2.19.1