shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

rtl8723bs wifi: fix complie warnings

Browse Source
This commit is contained in:
hwg
2014-08-20 19:33:47 +08:00
parent bc4f95ad2f
commit 046d286deb
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/wireless/rockchip_wlan/rtl8723bs/hal/OUTSRC/rtl8723b/HalPhyRf_8723B.c
View File

@@ -1909,11 +1909,6 @@ phy_IQCalibrate_8723B(
u4Byte Path_SEL_BB;
// u4Byte Path_SEL_BB, Path_SEL_RF;
if( pAdapter->registrypriv.mp_mode == 1 && pAdapter->mppriv.mode == 3 )
{
DBG_871X("%s() :return !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n",__func__);
return;
}
#if (DM_ODM_SUPPORT_TYPE & (ODM_AP|ODM_ADSL))
u4Byte retryCount = 2;
@@ -1925,6 +1920,12 @@ if( pAdapter->registrypriv.mp_mode == 1 && pAdapter->mppriv.mode == 3 )
#endif
#endif
if( pAdapter->registrypriv.mp_mode == 1 && pAdapter->mppriv.mode == 3 )
{
DBG_871X("%s() :return !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n",__func__);
return;
}
// Note: IQ calibration must be performed after loading
// PHY_REG.txt , and radio_a, radio_b.txt

6
drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/wifi_regd.c
View File

@@ -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
#endif //CONFIG_IOCTL_CFG80211

2
drivers/net/wireless/rockchip_wlan/wifi_sys/rkwifi_sys_iface.c
View File

@@ -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