wifi: rtlwifi: drop pre_fill_tx_bd_desc() from HAL interface

Since 'pre_fill_tx_bd_desc()' is actually used for rtl8192ee only,
there is no need to maintain function pointer in 'struct rtl_hal_ops',
and 'rtl92ee_pre_fill_tx_bd_desc()' may be converted to static.
Compile tested only.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20231016135925.129223-1-dmantipov@yandex.ru

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
index 616a47d8d97a28d17a071b316acc4e0e0f0614ed..011ce82efeff13614ebd73cf4f1d2af6e202f3d8 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
@@ -199,7 +199,6 @@ static struct rtl_hal_ops rtl8192ee_hal_ops = {
        .get_hw_reg = rtl92ee_get_hw_reg,
        .set_hw_reg = rtl92ee_set_hw_reg,
        .update_rate_tbl = rtl92ee_update_hal_rate_tbl,
-       .pre_fill_tx_bd_desc = rtl92ee_pre_fill_tx_bd_desc,
        .rx_desc_buff_remained_cnt = rtl92ee_rx_desc_buff_remained_cnt,
        .rx_check_dma_ok = rtl92ee_rx_check_dma_ok,
        .fill_tx_desc = rtl92ee_tx_fill_desc,

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
index 67388e0b3fa0eec69fd11500b03f0ef658886365..16589e18494b302da57b71bbe2288c4d636183cb 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c
@@ -550,9 +550,11 @@ u16 rtl92ee_get_available_desc(struct ieee80211_hw *hw, u8 q_idx)
        return point_diff;
 }
 
-void rtl92ee_pre_fill_tx_bd_desc(struct ieee80211_hw *hw,
-                                u8 *tx_bd_desc8, u8 *desc8, u8 queue_index,
-                                struct sk_buff *skb, dma_addr_t addr)
+static void rtl92ee_pre_fill_tx_bd_desc(struct ieee80211_hw *hw,
+                                       u8 *tx_bd_desc8, u8 *desc8,
+                                       u8 queue_index,
+                                       struct sk_buff *skb,
+                                       dma_addr_t addr)
 {
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h
index 3852a50a688bb528345255211cd1ee0405c914b5..4c6cf4f16f9572e0457899647c462390f218d66f 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h
@@ -720,9 +720,6 @@ void rtl92ee_rx_check_dma_ok(struct ieee80211_hw *hw, u8 *header_desc,
 u16    rtl92ee_rx_desc_buff_remained_cnt(struct ieee80211_hw *hw,
                                          u8 queue_index);
 u16 rtl92ee_get_available_desc(struct ieee80211_hw *hw, u8 queue_index);
-void rtl92ee_pre_fill_tx_bd_desc(struct ieee80211_hw *hw,
-                                u8 *tx_bd_desc, u8 *desc, u8 queue_index,
-                                struct sk_buff *skb, dma_addr_t addr);
 
 void rtl92ee_tx_fill_desc(struct ieee80211_hw *hw,
                          struct ieee80211_hdr *hdr, u8 *pdesc_tx,

diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index b064863ad59b623ad722ec31f10c63c59c4b707e..a712ac38eccc37770189539823e5b348b1301ef8 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -2227,9 +2227,6 @@ struct rtl_hal_ops {
        void (*update_rate_tbl)(struct ieee80211_hw *hw,
                                struct ieee80211_sta *sta, u8 rssi_leve,
                                bool update_bw);
-       void (*pre_fill_tx_bd_desc)(struct ieee80211_hw *hw, u8 *tx_bd_desc,
-                                   u8 *desc, u8 queue_index,
-                                   struct sk_buff *skb, dma_addr_t addr);
        void (*update_rate_mask)(struct ieee80211_hw *hw, u8 rssi_level);
        u16 (*rx_desc_buff_remained_cnt)(struct ieee80211_hw *hw,
                                         u8 queue_index);