r8169: inline rtl8169_free_rx_databuff
Heiner Kallweit
maintainerPATCH 1/1 r8169: inline rtl8169_free_rx_databuff
rtl8169_free_rx_databuff is used in only one place, so let's inline it. We can improve the loop because rtl8169_init_ring zero's RX_databuff before calling rtl8169_rx_fill, and rtl8169_rx_fill fills Rx_databuff starting from index 0.
Signed-off-by Heiner Kallweit <[email protected]>
--- drivers/net/ethernet/realtek/r8169_main.c | 24 +++++++---------------- 1 file changed, 7 insertions(+), 17 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +7 -17
@@ -5260,18 +5260,6 @@ static inline void rtl8169_make_unusable_by_asic(struct RxDesc *desc) desc->opts1 &= ~cpu_to_le32 (DescOwn | RsvdMask); } -static void rtl8169_free_rx_databuff (struct rtl8169_private *tp, -struct page **data_buff, -struct RxDesc *desc) -{ -dma_unmap_page (tp_to_dev (tp),le64_to_cpu (desc->addr), -R8169_RX_BUF_SIZE ,DMA_FROM_DEVICE ); - -__free_pages (*data_buff,get_order (R8169_RX_BUF_SIZE )); - *data_buff =NULL ; -rtl8169_make_unusable_by_asic (desc); -} -static inline void rtl8169_mark_to_asic (struct RxDesc *desc) {u32 eor =le32_to_cpu (desc->opts1) & RingEnd;
@@ -5312,11 +5300,13 @@ static void rtl8169_rx_clear(struct rtl8169_private *tp) {unsigned int i; -for (i =0 ; i <NUM_RX_DESC ; i++) { -if (tp->Rx_databuff[i]) { -rtl8169_free_rx_databuff (tp, tp->Rx_databuff + i, - tp->RxDescArray + i); - } +for (i =0 ; i <NUM_RX_DESC && tp->Rx_databuff[i]; i++) { +dma_unmap_page (tp_to_dev (tp), +le64_to_cpu (tp->RxDescArray[i].addr), +R8169_RX_BUF_SIZE ,DMA_FROM_DEVICE ); +__free_pages (tp->Rx_databuff[i],get_order (R8169_RX_BUF_SIZE )); + tp->Rx_databuff[i] =NULL ; +rtl8169_make_unusable_by_asic (tp->RxDescArray + i); } }
Signature · 1 line
2.22.0
From: Heiner Kallweit <[email protected]>
Date: Fri, 9 Aug 2019 22:59:07 +0200
Quoted 6 lines
rtl8169_free_rx_databuffis used in only one place, so let's inline it. We can improve the loop becausertl8169_init_ringzero'sRX_databuffbefore callingrtl8169_rx_fill, andrtl8169_rx_fillfillsRx_databuffstarting from index 0.Signed-off-by Heiner Kallweit <[email protected]>
Applied, thanks Heiner.