rtlwifi: remove hal_op c2h_content_parsing

Similar to rx_command_packet, we can call rtl_c2h_content_parsing so the
hal_op isn't necessary.

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/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
index 0d03e98f9cb4d3d6b10331b34373fde60f82932a..927b7d2315762de695eed4b95ed5b7a5bb350c5f 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
@@ -2346,7 +2346,6 @@ void rtl_c2h_content_parsing(struct ieee80211_hw *hw, u8 cmd_id,
                break;
        }
 }
-EXPORT_SYMBOL_GPL(rtl_c2h_content_parsing);
 
 void rtl_c2h_packet_handler(struct ieee80211_hw *hw, u8 *buffer, u8 len)
 {
@@ -2401,9 +2400,9 @@ void rtl_c2hcmd_launcher(struct ieee80211_hw *hw, int exec)
                if (!c2hcmd)
                        break;
 
-               if (rtlpriv->cfg->ops->c2h_content_parsing && exec)
-                       rtlpriv->cfg->ops->c2h_content_parsing(hw,
-                                       c2hcmd->tag, c2hcmd->len, c2hcmd->val);
+               if (exec)
+                       rtl_c2h_content_parsing(hw, c2hcmd->tag,
+                                               c2hcmd->len, c2hcmd->val);
 
                /* free */
                kfree(c2hcmd->val);

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
index 5b67ad748d67241166a3939c11ac6b02e9a47d00..9ea62599ecbb056fe34e92fd0b5166ea751b3c54 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
@@ -250,7 +250,6 @@ static struct rtl_hal_ops rtl8192ee_hal_ops = {
        .set_rfreg = rtl92ee_phy_set_rf_reg,
        .fill_h2c_cmd = rtl92ee_fill_h2c_cmd,
        .get_btc_status = rtl92ee_get_btc_status,
-       .c2h_content_parsing = rtl_c2h_content_parsing,
        .c2h_ra_report_handler = rtl92ee_c2h_ra_report_handler,
 };
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
index a41e67b3f38b3f4a36936b7c4ed88126d3a60b83..c9f7b042d9c6f35b8119f8b8ccaff926648b99c0 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
@@ -262,7 +262,6 @@ static struct rtl_hal_ops rtl8723be_hal_ops = {
        .fill_h2c_cmd = rtl8723be_fill_h2c_cmd,
        .get_btc_status = rtl8723be_get_btc_status,
        .is_fw_header = is_fw_header,
-       .c2h_content_parsing = rtl_c2h_content_parsing,
 };
 
 static struct rtl_mod_params rtl8723be_mod_params = {

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
index 8ff8a406db524f749c69aed58937454fe7f28289..77f6401021c9fdb022c68d30d6fae29f1428d4e6 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
@@ -303,7 +303,6 @@ static struct rtl_hal_ops rtl8821ae_hal_ops = {
        .set_rfreg = rtl8821ae_phy_set_rf_reg,
        .fill_h2c_cmd = rtl8821ae_fill_h2c_cmd,
        .get_btc_status = rtl8821ae_get_btc_status,
-       .c2h_content_parsing = rtl_c2h_content_parsing,
        .c2h_ra_report_handler = rtl8821ae_c2h_ra_report_handler,
        .add_wowlan_pattern = rtl8821ae_add_wowlan_pattern,
 };

diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index b40d8f5bbdce6b8284d8fad7c213576a9a83591f..930e1ec2280fd9d0eadaf666b8c4e33fad08e901 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -2344,8 +2344,6 @@ struct rtl_hal_ops {
                                   struct rtl_wow_pattern *rtl_pattern,
                                   u8 index);
        u16 (*get_available_desc)(struct ieee80211_hw *hw, u8 q_idx);
-       void (*c2h_content_parsing)(struct ieee80211_hw *hw, u8 tag, u8 len,
-                                   u8 *val);
        void (*c2h_ra_report_handler)(struct ieee80211_hw *hw,
                                      u8 *cmd_buf, u8 cmd_len);
 };