rtl8723bs wifi: fix complie warnings

diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/OUTSRC/rtl8723b/HalPhyRf_8723B.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/OUTSRC/rtl8723b/HalPhyRf_8723B.c
index 236443281b36bcc7efe4119411d1fce6de08f45f..5be6e57738a62b7a377a78ba1627de4ea615ab3a 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/OUTSRC/rtl8723b/HalPhyRf_8723B.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/OUTSRC/rtl8723b/HalPhyRf_8723B.c
@@ -1909,11 +1909,6 @@ phy_IQCalibrate_8723B(
 \r
        u4Byte Path_SEL_BB;\r
 //       u4Byte Path_SEL_BB, Path_SEL_RF;\r
-if( pAdapter->registrypriv.mp_mode == 1 && pAdapter->mppriv.mode == 3 )\r
-{\r
-               DBG_871X("%s() :return !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n",__func__);\r
-               return;\r
-}\r
 \r
 #if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))\r
        u4Byte  retryCount = 2;\r
@@ -1925,6 +1920,12 @@ if( pAdapter->registrypriv.mp_mode == 1 && pAdapter->mppriv.mode == 3 )
 #endif\r
 #endif\r
 \r
+if( pAdapter->registrypriv.mp_mode == 1 && pAdapter->mppriv.mode == 3 )\r
+{\r
+               DBG_871X("%s() :return !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n",__func__);\r
+               return;\r
+}\r
+\r
        // Note: IQ calibration must be performed after loading \r
        //              PHY_REG.txt , and radio_a, radio_b.txt  \r
        \r

diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/wifi_regd.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/wifi_regd.c
index 74895eaf90b8d7f560a02fe8fb3f7239f725f6f4..a4cbfd895c3831cb9dbce955e403479d985c0860 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/wifi_regd.c
+++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/wifi_regd.c
@@ -474,6 +474,8 @@ static const struct ieee80211_regdomain *_rtw_regdomain_select(struct
 #endif
 }
 
+typedef void (*reg_notifier_func) (struct wiphy *, struct regulatory_request *);
+
 static int _rtw_regd_init_wiphy(struct rtw_regulatory *reg,
                                struct wiphy *wiphy,
                                int (*reg_notifier) (struct wiphy * wiphy,
@@ -482,7 +484,7 @@ static int _rtw_regd_init_wiphy(struct rtw_regulatory *reg,
 {
        const struct ieee80211_regdomain *regd;
 
-       wiphy->reg_notifier = reg_notifier;
+       wiphy->reg_notifier = (reg_notifier_func) reg_notifier;
 
        wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
        wiphy->flags &= ~WIPHY_FLAG_STRICT_REGULATORY;
@@ -544,4 +546,4 @@ int rtw_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)
 
        return _rtw_reg_notifier_apply(wiphy, request, reg);
 }
-#endif //CONFIG_IOCTL_CFG80211
\ No newline at end of file
+#endif //CONFIG_IOCTL_CFG80211

diff --git a/drivers/net/wireless/rockchip_wlan/wifi_sys/rkwifi_sys_iface.c b/drivers/net/wireless/rockchip_wlan/wifi_sys/rkwifi_sys_iface.c
index 879c1d2019cd22865a5f17f83119990861382ca9..cccdd328176fb1a9a81cce04d9f790b4ebc66be2 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/wifi_sys/rkwifi_sys_iface.c
+++ b/drivers/net/wireless/rockchip_wlan/wifi_sys/rkwifi_sys_iface.c
@@ -204,7 +204,7 @@ static int wifi_init_exit_module(int enable)
 #endif
 
 #if !defined(CONFIG_RKWIFI) && !defined(CONFIG_RTL8188EU) && !defined(CONFIG_ESP8089)
-    if (type > 0) {
+    if (type >= 0) {
         if (enable > 0)
             ret = rockchip_wifi_init_module();
         else