rtlwifi: remove dummy hal_op rx_command_packet from rtl8188ee and rtl8723ae

The caller of hal_op rx_command_packet will assert function pointer
before calling, so we can remove dummy functions safely.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
index 82681b96ef93ee71d93984fdb02081d13877b9bb..8c15ffd3568ba64a2118bc23aeec3ede8fa053c7 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
@@ -263,8 +263,6 @@ static struct rtl_hal_ops rtl8188ee_hal_ops = {
        .get_rfreg = rtl88e_phy_query_rf_reg,
        .set_rfreg = rtl88e_phy_set_rf_reg,
        .get_btc_status = rtl88e_get_btc_status,
-       .rx_command_packet = rtl88ee_rx_command_packet,
-
 };
 
 static struct rtl_mod_params rtl88ee_mod_params = {

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
index 9670732b2bc617cdc4577d802c9fbdc6fd3bc060..4c1f8b08fc109399260d4bd5b9f5c12f88ad2967 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c
@@ -850,10 +850,3 @@ void rtl88ee_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
                               BIT(0) << (hw_queue));
        }
 }
-
-u32 rtl88ee_rx_command_packet(struct ieee80211_hw *hw,
-                             const struct rtl_stats *status,
-                             struct sk_buff *skb)
-{
-       return 0;
-}

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h
index f902d6769aa85df9d6eeb9c676f23ffe30e0d9ac..127ba977206f3acacb16805f727059dcf1304dd4 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h
@@ -790,8 +790,4 @@ void rtl88ee_tx_polling(struct ieee80211_hw *hw, u8 hw_queue);
 void rtl88ee_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
                             bool firstseg, bool lastseg,
                             struct sk_buff *skb);
-u32 rtl88ee_rx_command_packet(struct ieee80211_hw *hw,
-                             const struct rtl_stats *status,
-                             struct sk_buff *skb);
-
 #endif

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
index a545ea3173233a68fab1bb3bbb6da8c8f3880014..07b82700d1de3bda743f9c9149502e415efdae63 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
@@ -260,7 +260,6 @@ static struct rtl_hal_ops rtl8723e_hal_ops = {
        .bt_coex_off_before_lps =
                rtl8723e_dm_bt_turn_off_bt_coexist_before_enter_lps,
        .get_btc_status = rtl8723e_get_btc_status,
-       .rx_command_packet = rtl8723e_rx_command_packet,
        .is_fw_header = is_fw_header,
 };
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
index 23485602a9a108ba7aaf08e58eb6fc4b022c4d16..d461d0c9631fd58b0e0256a7cd46f774509bf23d 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
@@ -709,10 +709,3 @@ void rtl8723e_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
                               BIT(0) << (hw_queue));
        }
 }
-
-u32 rtl8723e_rx_command_packet(struct ieee80211_hw *hw,
-                              const struct rtl_stats *status,
-                              struct sk_buff *skb)
-{
-       return 0;
-}

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h
index 985ce0b77ea5ef5aa405b70382460e96b6fee626..d592b08d4ac83de652ee8710a4bd73e188a5571e 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.h
@@ -716,7 +716,4 @@ void rtl8723e_tx_polling(struct ieee80211_hw *hw, u8 hw_queue);
 void rtl8723e_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc,
                              bool firstseg, bool lastseg,
                              struct sk_buff *skb);
-u32 rtl8723e_rx_command_packet(struct ieee80211_hw *hw,
-                              const struct rtl_stats *status,
-                              struct sk_buff *skb);
 #endif