]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
r8169: remove rtl8169_map_to_asic
authorHeiner Kallweit <hkallweit1@gmail.com>
Tue, 17 Apr 2018 21:26:41 +0000 (23:26 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 19 Apr 2018 01:11:58 +0000 (21:11 -0400)
This function is very simple and used only once, so we can inline
the two statements.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/realtek/r8169.c

index c68771d0e89bc4f6f28321dd2c979303c7b3527d..347c61521e56a70e5a23f353d79b0903835e8809 100644 (file)
@@ -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: