Commit fc83ee9d authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Kalle Valo
Browse files

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: default avatarDmitry Antipov <dmantipov@yandex.ru>
Acked-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20231016135925.129223-1-dmantipov@yandex.ru
parent 388df379

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.c

+5 −3
Original line number Diff line number Diff line
@@ -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));

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/trx.h

+0 −3
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/realtek/rtlwifi/wifi.h

+0 −3
Original line number Diff line number Diff line
@@ -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);