diff options
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/rtlwifi/TODO | 8 | ||||
| -rw-r--r-- | drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c | 23 | ||||
| -rw-r--r-- | drivers/staging/rtlwifi/debug.c | 5 | ||||
| -rw-r--r-- | drivers/staging/rtlwifi/rtl8822be/sw.c | 2 |
4 files changed, 17 insertions, 21 deletions
diff --git a/drivers/staging/rtlwifi/TODO b/drivers/staging/rtlwifi/TODO index 52a85cdf453c..4a084f2fc5d0 100644 --- a/drivers/staging/rtlwifi/TODO +++ b/drivers/staging/rtlwifi/TODO @@ -1,11 +1,11 @@ TODO: -- checkpatch.pl fixes - most of the remaining ones are lines too long. Many - of them will require refactoring -- merge Realtek's bugfixes and new features into the driver - find and remove code blocks guarded by never set CONFIG_FOO defines - convert any remaining unusual variable types - find codes that can use %pM and %Nph formatting -- fix any reviewer's comments regarding movin the driver to drivers/net/wireless +- checkpatch.pl fixes - most of the remaining ones are lines too long. Many + of them will require refactoring +- merge Realtek's bugfixes and new features into the driver +- address any reviewers comments Please send any patches to Greg Kroah-Hartman <gregkh@linuxfoundation.org>, and Larry Finger <Larry.Finger@lwfinger.net>. diff --git a/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c index 39229cdb8045..52620b72cfa9 100644 --- a/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c +++ b/drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c @@ -791,18 +791,17 @@ static void halbtc_display_wifi_status(struct btc_coexist *btcoexist, struct seq_file *m) { struct rtl_priv *rtlpriv = btcoexist->adapter; - s32 wifi_rssi = 0, bt_hs_rssi = 0; - bool scan = false, link = false, roam = false, wifi_busy = false, - wifi_under_b_mode = false, - wifi_under_5g = false; - u32 wifi_bw = BTC_WIFI_BW_HT20, - wifi_traffic_dir = BTC_WIFI_TRAFFIC_TX, - wifi_freq = BTC_FREQ_2_4G; - u32 wifi_link_status = 0x0; - bool bt_hs_on = false, under_ips = false, under_lps = false, - low_power = false, dc_mode = false; - u8 wifi_chnl = 0, wifi_hs_chnl = 0, fw_ps_state; - u8 ap_num = 0; + s32 wifi_rssi = 0, bt_hs_rssi = 0; + bool scan = false, link = false, roam = false, wifi_busy = false; + bool wifi_under_b_mode = false, wifi_under_5g = false; + u32 wifi_bw = BTC_WIFI_BW_HT20; + u32 wifi_traffic_dir = BTC_WIFI_TRAFFIC_TX; + u32 wifi_freq = BTC_FREQ_2_4G; + u32 wifi_link_status = 0x0; + bool bt_hs_on = false, under_ips = false, under_lps = false; + bool low_power = false, dc_mode = false; + u8 wifi_chnl = 0, wifi_hs_chnl = 0, fw_ps_state; + u8 ap_num = 0; wifi_link_status = halbtc_get_wifi_link_status(btcoexist); seq_printf(m, "\n %-35s = %d/ %d/ %d/ %d/ %d", diff --git a/drivers/staging/rtlwifi/debug.c b/drivers/staging/rtlwifi/debug.c index ed26267393be..b9fd47aeaa9b 100644 --- a/drivers/staging/rtlwifi/debug.c +++ b/drivers/staging/rtlwifi/debug.c @@ -511,10 +511,7 @@ void rtl_debug_add_one(struct ieee80211_hw *hw) rtlpriv->dbg.msg_buf = vzalloc(80 * 25); - snprintf(rtlpriv->dbg.debugfs_name, 18, "%02x-%02x-%02x-%02x-%02x-%02x", - rtlefuse->dev_addr[0], rtlefuse->dev_addr[1], - rtlefuse->dev_addr[2], rtlefuse->dev_addr[3], - rtlefuse->dev_addr[4], rtlefuse->dev_addr[5]); + snprintf(rtlpriv->dbg.debugfs_name, 18, "%pMF", rtlefuse->dev_addr); rtlpriv->dbg.debugfs_dir = debugfs_create_dir(rtlpriv->dbg.debugfs_name, debugfs_topdir); diff --git a/drivers/staging/rtlwifi/rtl8822be/sw.c b/drivers/staging/rtlwifi/rtl8822be/sw.c index 913fec4f1eea..91b784b6d1c5 100644 --- a/drivers/staging/rtlwifi/rtl8822be/sw.c +++ b/drivers/staging/rtlwifi/rtl8822be/sw.c @@ -432,7 +432,7 @@ static struct rtl_hal_cfg rtl8822be_hal_cfg = { .maps[RTL_RC_VHT_RATE_2SS_MCS9] = DESC_RATEVHT2SS_MCS9, }; -static struct pci_device_id rtl8822be_pci_ids[] = { +static const struct pci_device_id rtl8822be_pci_ids[] = { {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0xB822, rtl8822be_hal_cfg)}, {}, }; |