From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH net-next 10/19] r8169: remove rtl8169_map_to_asic Date: Tue, 17 Apr 2018 23:26:41 +0200 Message-ID: <9fc01e59-0907-f7e1-6c48-74520f697a3f@gmail.com> References: <4049e598-1b6c-bc3e-a905-178b76d7b161@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-wr0-f195.google.com ([209.85.128.195]:46928 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752840AbeDQVgp (ORCPT ); Tue, 17 Apr 2018 17:36:45 -0400 Received: by mail-wr0-f195.google.com with SMTP id d1so39359536wrj.13 for ; Tue, 17 Apr 2018 14:36:45 -0700 (PDT) In-Reply-To: <4049e598-1b6c-bc3e-a905-178b76d7b161@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: This function is very simple and used only once, so we can inline the two statements. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index c68771d0..347c6152 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -6713,12 +6713,6 @@ static inline void rtl8169_mark_to_asic(struct RxDesc *desc) desc->opts1 = cpu_to_le32(DescOwn | eor | R8169_RX_BUF_SIZE); } -static inline void rtl8169_map_to_asic(struct RxDesc *desc, dma_addr_t mapping) -{ - desc->addr = cpu_to_le64(mapping); - rtl8169_mark_to_asic(desc); -} - static inline void *rtl8169_align(void *data) { return (void *)ALIGN((long)data, 16); @@ -6751,7 +6745,8 @@ static struct sk_buff *rtl8169_alloc_rx_data(struct rtl8169_private *tp, goto err_out; } - rtl8169_map_to_asic(desc, mapping); + desc->addr = cpu_to_le64(mapping); + rtl8169_mark_to_asic(desc); return data; err_out: -- 2.17.0