staging: rtl8723bs: remove unused struct rtw_regulatory

The struct rtw_regulatory is never used in the rtl8723bs driver.
Functions taking it as a parameter are always passed NULL and
perform no logic with it. Remove the dead code and the struct.

Suggested-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Kenet Jovan Sokoli <deep@crimson.net.eu.org>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Link: https://patch.msgid.link/20260414081325.142313-1-deep@crimson.net.eu.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/include/wifi.h b/drivers/staging/rtl8723bs/include/wifi.h
index 2876f15f13d1d79204d93a40705a9f0b3340c386..92b7882de15c642758c11b3df85b165b61dbaaee 100644 (file)
--- a/drivers/staging/rtl8723bs/include/wifi.h
+++ b/drivers/staging/rtl8723bs/include/wifi.h
@@ -447,15 +447,4 @@ struct regd_pair_mapping {
        u16 reg_2ghz_ctl;
 };
 
-struct rtw_regulatory {
-       char alpha2[2];
-       u16 country_code;
-       u16 max_power_level;
-       u32 tp_scale;
-       u16 current_rd;
-       u16 current_rd_ext;
-       int16_t power_limit;
-       struct regd_pair_mapping *regpair;
-};
-
 #endif /*  _WIFI_H_ */

diff --git a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
index f9c4d487badf0e5b21a31b5da57c5aff28562500..c48a1e3ba4acc4a5ac18e8e0a4f52fec44a25359 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
+++ b/drivers/staging/rtl8723bs/os_dep/wifi_regd.c
@@ -83,23 +83,19 @@ static void _rtw_reg_apply_flags(struct wiphy *wiphy)
 }
 
 static int _rtw_reg_notifier_apply(struct wiphy *wiphy,
-                                  struct regulatory_request *request,
-                                  struct rtw_regulatory *reg)
+                                  struct regulatory_request *request)
 {
        /* Hard code flags */
        _rtw_reg_apply_flags(wiphy);
        return 0;
 }
 
-static const struct ieee80211_regdomain *_rtw_regdomain_select(struct
-                                                              rtw_regulatory
-                                                              *reg)
+static const struct ieee80211_regdomain *_rtw_regdomain_select(void)
 {
        return &rtw_regdom_rd;
 }
 
-static void _rtw_regd_init_wiphy(struct rtw_regulatory *reg,
-                                struct wiphy *wiphy,
+static void _rtw_regd_init_wiphy(struct wiphy *wiphy,
                                 void (*reg_notifier)(struct wiphy *wiphy,
                                                      struct
                                                      regulatory_request *
@@ -113,7 +109,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_regdomain_select();
        wiphy_apply_custom_regulatory(wiphy, regd);
 
        /* Hard code flags */
@@ -124,12 +120,10 @@ void rtw_regd_init(struct wiphy *wiphy,
                   void (*reg_notifier)(struct wiphy *wiphy,
                                        struct regulatory_request *request))
 {
-       _rtw_regd_init_wiphy(NULL, wiphy, reg_notifier);
+       _rtw_regd_init_wiphy(wiphy, reg_notifier);
 }
 
 void rtw_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)
 {
-       struct rtw_regulatory *reg = NULL;
-
-       _rtw_reg_notifier_apply(wiphy, request, reg);
+       _rtw_reg_notifier_apply(wiphy, request);
 }