openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtlwifi: rtl8192ce: Fix missing blank lines 

The problems filed include the following:

WARNING: Missing a blank line after declarations
CHECK: Please don't use multiple blank lines

There are no code changes.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Larry Finger 2019-02-21 13:31:13 -06:00 committed by Kalle Valo
parent b16abaafea
commit 2973af748d
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c
View File

@ -144,6 +144,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
case HW_VAR_BASIC_RATE:{ case HW_VAR_BASIC_RATE:{
u16 rate_cfg = ((u16 *) val)[0]; u16 rate_cfg = ((u16 *) val)[0];
u8 rate_index = 0; u8 rate_index = 0;
rate_cfg &= 0x15f; rate_cfg &= 0x15f;
rate_cfg |= 0x01; rate_cfg |= 0x01;
rtl_write_byte(rtlpriv, REG_RRSR, rate_cfg & 0xff); rtl_write_byte(rtlpriv, REG_RRSR, rate_cfg & 0xff);
@ -197,6 +198,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
case HW_VAR_ACK_PREAMBLE:{ case HW_VAR_ACK_PREAMBLE:{
u8 reg_tmp; u8 reg_tmp;
u8 short_preamble = (bool)*val; u8 short_preamble = (bool)*val;
reg_tmp = (mac->cur_40_prime_sc) << 5; reg_tmp = (mac->cur_40_prime_sc) << 5;
if (short_preamble) if (short_preamble)
reg_tmp |= 0x80; reg_tmp |= 0x80;
@ -293,6 +295,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
} }
case HW_VAR_AC_PARAM:{ case HW_VAR_AC_PARAM:{
u8 e_aci = *(val); u8 e_aci = *(val);
rtl92c_dm_init_edca_turbo(hw); rtl92c_dm_init_edca_turbo(hw);
if (rtlpci->acm_method != EACMWAY2_SW) if (rtlpci->acm_method != EACMWAY2_SW)
@ -456,6 +459,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
break; break;
case HW_VAR_AID:{ case HW_VAR_AID:{
u16 u2btmp; u16 u2btmp;
u2btmp = rtl_read_word(rtlpriv, REG_BCN_PSR_RPT); u2btmp = rtl_read_word(rtlpriv, REG_BCN_PSR_RPT);
u2btmp &= 0xC000; u2btmp &= 0xC000;
rtl_write_word(rtlpriv, REG_BCN_PSR_RPT, (u2btmp | rtl_write_word(rtlpriv, REG_BCN_PSR_RPT, (u2btmp |
@ -661,6 +665,7 @@ static bool _rtl92ce_init_mac(struct ieee80211_hw *hw)
rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x00); rtl_write_byte(rtlpriv, REG_RSV_CTRL, 0x00);
if (rtlpriv->btcoexist.bt_coexistence) { if (rtlpriv->btcoexist.bt_coexistence) {
u32 value32; u32 value32;
value32 = rtl_read_dword(rtlpriv, REG_APS_FSMCO); value32 = rtl_read_dword(rtlpriv, REG_APS_FSMCO);
value32 |= (SOP_ABG | SOP_AMB | XOP_BTCK); value32 |= (SOP_ABG | SOP_AMB | XOP_BTCK);
rtl_write_dword(rtlpriv, REG_APS_FSMCO, value32); rtl_write_dword(rtlpriv, REG_APS_FSMCO, value32);
@ -1245,6 +1250,7 @@ int rtl92ce_set_network_type(struct ieee80211_hw *hw, enum nl80211_iftype type)
void rtl92ce_set_qos(struct ieee80211_hw *hw, int aci) void rtl92ce_set_qos(struct ieee80211_hw *hw, int aci)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
rtl92c_dm_init_edca_turbo(hw); rtl92c_dm_init_edca_turbo(hw);
switch (aci) { switch (aci) {
case AC1_BK: case AC1_BK:
@ -2279,7 +2285,6 @@ void rtl8192ce_bt_reg_init(struct ieee80211_hw *hw)
rtlpriv->btcoexist.reg_bt_sco = 0; rtlpriv->btcoexist.reg_bt_sco = 0;
} }
void rtl8192ce_bt_hw_init(struct ieee80211_hw *hw) void rtl8192ce_bt_hw_init(struct ieee80211_hw *hw)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);

1
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c
View File

@ -443,6 +443,7 @@ static bool _rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,
RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) { RT_IN_PS_LEVEL(ppsc, RT_RF_OFF_LEVL_HALT_NIC)) {
bool rtstatus; bool rtstatus;
u32 initializecount = 0; u32 initializecount = 0;
do { do {
initializecount++; initializecount++;
RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG,

1
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.c
View File

@ -3,7 +3,6 @@
#include "table.h" #include "table.h"
u32 RTL8192CEPHY_REG_2TARRAY[PHY_REG_2TARRAY_LENGTH] = { u32 RTL8192CEPHY_REG_2TARRAY[PHY_REG_2TARRAY_LENGTH] = {
0x024, 0x0011800f, 0x024, 0x0011800f,
0x028, 0x00ffdb83, 0x028, 0x00ffdb83,

8
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c
View File

@ -36,6 +36,7 @@ static u8 _rtl92c_query_rxpwrpercentage(s8 antpower)
static u8 _rtl92c_evm_db_to_percentage(s8 value) static u8 _rtl92c_evm_db_to_percentage(s8 value)
{ {
s8 ret_val; s8 ret_val;
ret_val = value; ret_val = value;
if (ret_val >= 0) if (ret_val >= 0)
@ -109,6 +110,7 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
if (is_cck_rate) { if (is_cck_rate) {
u8 report, cck_highpwr; u8 report, cck_highpwr;
cck_buf = (struct phy_sts_cck_8192s_t *)p_drvinfo; cck_buf = (struct phy_sts_cck_8192s_t *)p_drvinfo;
if (ppsc->rfpwr_state == ERFON) if (ppsc->rfpwr_state == ERFON)
@ -120,6 +122,7 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
if (!cck_highpwr) { if (!cck_highpwr) {
u8 cck_agc_rpt = cck_buf->cck_agc_rpt; u8 cck_agc_rpt = cck_buf->cck_agc_rpt;
report = cck_buf->cck_agc_rpt & 0xc0; report = cck_buf->cck_agc_rpt & 0xc0;
report = report >> 6; report = report >> 6;
switch (report) { switch (report) {
@ -138,6 +141,7 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
} }
} else { } else {
u8 cck_agc_rpt = cck_buf->cck_agc_rpt; u8 cck_agc_rpt = cck_buf->cck_agc_rpt;
report = p_drvinfo->cfosho[0] & 0x60; report = p_drvinfo->cfosho[0] & 0x60;
report = report >> 5; report = report >> 5;
switch (report) { switch (report) {
@ -182,6 +186,7 @@ static void _rtl92ce_query_rxphystatus(struct ieee80211_hw *hw,
/* (3) Get Signal Quality (EVM) */ /* (3) Get Signal Quality (EVM) */
if (packet_match_bssid) { if (packet_match_bssid) {
u8 sq; u8 sq;
if (pstats->rx_pwdb_all > 40) if (pstats->rx_pwdb_all > 40)
sq = 100; sq = 100;
else { else {
@ -318,6 +323,7 @@ bool rtl92ce_rx_query_desc(struct ieee80211_hw *hw,
struct rx_desc_92c *pdesc = (struct rx_desc_92c *)p_desc; struct rx_desc_92c *pdesc = (struct rx_desc_92c *)p_desc;
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
u32 phystatus = GET_RX_DESC_PHYST(pdesc); u32 phystatus = GET_RX_DESC_PHYST(pdesc);
stats->length = (u16) GET_RX_DESC_PKT_LEN(pdesc); stats->length = (u16) GET_RX_DESC_PKT_LEN(pdesc);
stats->rx_drvinfo_size = (u8) GET_RX_DESC_DRV_INFO_SIZE(pdesc) * stats->rx_drvinfo_size = (u8) GET_RX_DESC_DRV_INFO_SIZE(pdesc) *
RX_DRV_INFO_SIZE_UNIT; RX_DRV_INFO_SIZE_UNIT;
@ -497,6 +503,7 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw,
if (sta) { if (sta) {
u8 ampdu_density = sta->ht_cap.ampdu_density; u8 ampdu_density = sta->ht_cap.ampdu_density;
SET_TX_DESC_AMPDU_DENSITY(pdesc, ampdu_density); SET_TX_DESC_AMPDU_DENSITY(pdesc, ampdu_density);
} }
@ -733,6 +740,7 @@ bool rtl92ce_is_tx_desc_closed(struct ieee80211_hw *hw,
void rtl92ce_tx_polling(struct ieee80211_hw *hw, u8 hw_queue) void rtl92ce_tx_polling(struct ieee80211_hw *hw, u8 hw_queue)
{ {
struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_priv *rtlpriv = rtl_priv(hw);
if (hw_queue == BEACON_QUEUE) { if (hw_queue == BEACON_QUEUE) {
rtl_write_word(rtlpriv, REG_PCIE_CTRL_REG, BIT(4)); rtl_write_word(rtlpriv, REG_PCIE_CTRL_REG, BIT(4));
} else { } else {