Skip to contentSkip to conversation

staging: rtl8723bs: os_dep: Remove function _rtw_regdomain_select

PATCH Superseded Hariprasad Kelam 2 participants 2 messages Jul 25, 2019 – Jul 30, 2019 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8723bs: os_dep: Remove function _rtw_regdomain_select

This function simply returns &rtw_regdom_rd . So replace this function with actual code

---
 drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/staging/rtl8723bs/os_dep/wifi_regd.c +1 -8
index aa2f62a..bbd83b2 100644
@@ -115,13 +115,6 @@ static int _rtw_reg_notifier_apply(struct wiphy *wiphy,
 	return 0;
 }
 
-static const struct ieee80211_regdomain *_rtw_regdomain_select(struct
-							       rtw_regulatory
-							       *reg)
-{
-	return &rtw_regdom_rd;
-}
-
 static void _rtw_regd_init_wiphy(struct rtw_regulatory *reg,
 				 struct wiphy *wiphy,
 				 void (*reg_notifier)(struct wiphy *wiphy,
@@ -137,7 +130,7 @@ static void _rtw_regd_init_wiphy(struct rtw_regulatory *reg,
 	wiphy->regulatory_flags &= ~REGULATORY_STRICT_REG;
 	wiphy->regulatory_flags &= ~REGULATORY_DISABLE_BEACON_HINTS;
 
-	regd = _rtw_regdomain_select(reg);
+	regd = &rtw_regdom_rd;
 	wiphy_apply_custom_regulatory(wiphy, regd);
 
 	/* Hard code flags */
Signature · 1 line
2.7.4
#1 lore raw
Quoted 7 lines · Hariprasad Kelam

This function simply returns &rtw_regdom_rd . So replace this function with actual code

---
 drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

You have sent 11 patches for this driver in the past few days, and I have no idea what order to apply them in.

Please resend them all as a patch series, properly numbered so that I have a chance to apply them in the correct order.

thanks,

greg k-h