Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4f6ee48 authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

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: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 23ffab17

drivers/net/wireless/realtek/rtlwifi/base.c

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

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

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

};

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

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

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

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

};

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

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

};