Commit e703c5dd authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: Remove CamelCase variables from base code 



There are a number of CamelCase variables remaining in the source
files of modules rtl_pci, rtl_usb, and rtlwifi.

The following checkpatch excettions are also fixed:

for_kalle1/0001-rtlwifi-Remove-CamelCase-variables-from-base-code.patch
-----------------------------------------------------------------------
CHECK: Unnecessary parentheses around 'rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i] !=
                             rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i]'
#68: FILE: drivers/net/wireless/realtek/rtlwifi/efuse.c:377:
+                       if ((rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i] !=
+                            rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i]) ||
+                           (rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i + 1] !=
+                            rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i +
                                                                   1])) {

CHECK: Unnecessary parentheses around 'rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i + 1] !=
                             rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i +
                                                                   1]'
#68: FILE: drivers/net/wireless/realtek/rtlwifi/efuse.c:377:
+                       if ((rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i] !=
+                            rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i]) ||
+                           (rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i + 1] !=
+                            rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i +
                                                                   1])) {

WARNING: line over 80 characters
#70: FILE: drivers/net/wireless/realtek/rtlwifi/efuse.c:379:
+                           (rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i + 1] !=

CHECK: No space is necessary after a cast
#186: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c:396:
+       status->rx_is40mhzpacket = (bool) GET_RX_DESC_BW(pdesc);

CHECK: No space is necessary after a cast
#208: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c:335:
+       stats->rx_is40mhzpacket = (bool) GET_RX_DESC_BW(pdesc);

CHECK: No space is necessary after a cast
#243: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c:301:
+       stats->rx_is40mhzpacket = (bool) GET_RX_DESC_BW(pdesc);

CHECK: No space is necessary after a cast
#252: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192cu/trx.c:368:
+       stats.rx_is40mhzpacket = (bool) GET_RX_DESC_BW(rxdesc);

CHECK: No space is necessary after a cast
#265: FILE: drivers/net/wireless/realtek/rtlwifi/rtl8192de/trx.c:475:
+       stats->rx_is40mhzpacket = (bool) GET_RX_DESC_BW(pdesc);

WARNING: Unnecessary space before function pointer arguments
#455: FILE: drivers/net/wireless/realtek/rtlwifi/wifi.h:1462:
+       void (*writen_sync) (struct rtl_priv *rtlpriv, u32 addr, void *buf,

WARNING: Unnecessary space before function pointer arguments
#483: FILE: drivers/net/wireless/realtek/rtlwifi/wifi.h:2257:
+       void (*fill_fake_txdesc) (struct ieee80211_hw *hw, u8 *pdesc,

Note that not all checkpatch exceptions are addressed. Those will be
handled in later patches.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 03f3dd37

drivers/net/wireless/realtek/rtlwifi/debug.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ enum dbgp_flag_e { 
	FEEPROM = 11,

	FPWR = 12,

	FDM = 13,

	FDBGCtrl = 14,

	FDBGCTRL = 14,

	FC2H = 15,

	FBT = 16,

	FINIT = 17,

drivers/net/wireless/realtek/rtlwifi/efuse.c

+22 −22
Original line number Diff line number Diff line
@@ -365,20 +365,20 @@ bool efuse_shadow_update_chk(struct ieee80211_hw *hw) 
{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_efuse *rtlefuse = rtl_efuse(rtl_priv(hw));

	u8 section_idx, i, Base;

	u8 section_idx, i, base;

	u16 words_need = 0, hdr_num = 0, totalbytes, efuse_used;

	bool wordchanged, result = true;



	for (section_idx = 0; section_idx < 16; section_idx++) {

		Base = section_idx * 8;

		base = section_idx * 8;

		wordchanged = false;



		for (i = 0; i < 8; i = i + 2) {

			if ((rtlefuse->efuse_map[EFUSE_INIT_MAP][Base + i] !=

			     rtlefuse->efuse_map[EFUSE_MODIFY_MAP][Base + i]) ||

			    (rtlefuse->efuse_map[EFUSE_INIT_MAP][Base + i + 1] !=

			     rtlefuse->efuse_map[EFUSE_MODIFY_MAP][Base + i +

								   1])) {

			if (rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i] !=

			    rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i] ||

			    rtlefuse->efuse_map[EFUSE_INIT_MAP][base + i + 1] !=

			    rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base + i +

								   1]) {

				words_need++;

				wordchanged = true;

			}
@@ -519,7 +519,7 @@ void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw) 
}

EXPORT_SYMBOL(rtl_efuse_shadow_map_update);



void efuse_force_write_vendor_Id(struct ieee80211_hw *hw)

void efuse_force_write_vendor_id(struct ieee80211_hw *hw)

{

	u8 tmpdata[8] = { 0xFF, 0xFF, 0xEC, 0x10, 0xFF, 0xFF, 0xFF, 0xFF };
@@ -1111,7 +1111,7 @@ void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate) 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));

	u8 tempval;

	u16 tmpV16;

	u16 tmpv16;



	if (pwrstate && (rtlhal->hw_type != HARDWARE_TYPE_RTL8192SE)) {
@@ -1120,31 +1120,31 @@ void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate) 
			rtl_write_byte(rtlpriv,

				       rtlpriv->cfg->maps[EFUSE_ACCESS], 0x69);

		} else {

			tmpV16 =

			tmpv16 =

			  rtl_read_word(rtlpriv,

					rtlpriv->cfg->maps[SYS_ISO_CTRL]);

			if (!(tmpV16 & rtlpriv->cfg->maps[EFUSE_PWC_EV12V])) {

				tmpV16 |= rtlpriv->cfg->maps[EFUSE_PWC_EV12V];

			if (!(tmpv16 & rtlpriv->cfg->maps[EFUSE_PWC_EV12V])) {

				tmpv16 |= rtlpriv->cfg->maps[EFUSE_PWC_EV12V];

				rtl_write_word(rtlpriv,

					       rtlpriv->cfg->maps[SYS_ISO_CTRL],

					       tmpV16);

					       tmpv16);

			}

		}

		tmpV16 = rtl_read_word(rtlpriv,

		tmpv16 = rtl_read_word(rtlpriv,

				       rtlpriv->cfg->maps[SYS_FUNC_EN]);

		if (!(tmpV16 & rtlpriv->cfg->maps[EFUSE_FEN_ELDR])) {

			tmpV16 |= rtlpriv->cfg->maps[EFUSE_FEN_ELDR];

		if (!(tmpv16 & rtlpriv->cfg->maps[EFUSE_FEN_ELDR])) {

			tmpv16 |= rtlpriv->cfg->maps[EFUSE_FEN_ELDR];

			rtl_write_word(rtlpriv,

				       rtlpriv->cfg->maps[SYS_FUNC_EN], tmpV16);

				       rtlpriv->cfg->maps[SYS_FUNC_EN], tmpv16);

		}



		tmpV16 = rtl_read_word(rtlpriv, rtlpriv->cfg->maps[SYS_CLK]);

		if ((!(tmpV16 & rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN])) ||

		    (!(tmpV16 & rtlpriv->cfg->maps[EFUSE_ANA8M]))) {

			tmpV16 |= (rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN] |

		tmpv16 = rtl_read_word(rtlpriv, rtlpriv->cfg->maps[SYS_CLK]);

		if ((!(tmpv16 & rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN])) ||

		    (!(tmpv16 & rtlpriv->cfg->maps[EFUSE_ANA8M]))) {

			tmpv16 |= (rtlpriv->cfg->maps[EFUSE_LOADER_CLK_EN] |

				   rtlpriv->cfg->maps[EFUSE_ANA8M]);

			rtl_write_word(rtlpriv,

				       rtlpriv->cfg->maps[SYS_CLK], tmpV16);

				       rtlpriv->cfg->maps[SYS_CLK], tmpv16);

		}

	}

drivers/net/wireless/realtek/rtlwifi/efuse.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ void efuse_shadow_write(struct ieee80211_hw *hw, u8 type, 
bool efuse_shadow_update(struct ieee80211_hw *hw);

bool efuse_shadow_update_chk(struct ieee80211_hw *hw);

void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw);

void efuse_force_write_vendor_Id(struct ieee80211_hw *hw);

void efuse_force_write_vendor_id(struct ieee80211_hw *hw);

void efuse_re_pg_section(struct ieee80211_hw *hw, u8 section_idx);

void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate);

int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv,

drivers/net/wireless/realtek/rtlwifi/regd.c

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include "wifi.h"

#include "regd.h"



static struct country_code_to_enum_rd allCountries[] = {

static struct country_code_to_enum_rd all_countries[] = {

	{COUNTRY_CODE_FCC, "US"},

	{COUNTRY_CODE_IC, "US"},

	{COUNTRY_CODE_ETSI, "EC"},
@@ -369,9 +369,9 @@ static struct country_code_to_enum_rd *_rtl_regd_find_country(u16 countrycode) 
{

	int i;



	for (i = 0; i < ARRAY_SIZE(allCountries); i++) {

		if (allCountries[i].countrycode == countrycode)

			return &allCountries[i];

	for (i = 0; i < ARRAY_SIZE(all_countries); i++) {

		if (all_countries[i].countrycode == countrycode)

			return &all_countries[i];

	}

	return NULL;

}

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c

+2 −2
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw, 
				(GET_RX_DESC_FAGGR(pdesc) == 1));

	if (status->packet_report_type == NORMAL_RX)

		status->timestamp_low = GET_RX_DESC_TSFL(pdesc);

	status->rx_is40Mhzpacket = (bool) GET_RX_DESC_BW(pdesc);

	status->rx_is40mhzpacket = (bool)GET_RX_DESC_BW(pdesc);

	status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);



	status->is_cck = RTL8188_RX_HAL_IS_CCK_RATE(status->rate);
@@ -420,7 +420,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw, 
	if (status->crc)

		rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;



	if (status->rx_is40Mhzpacket)

	if (status->rx_is40mhzpacket)

		rx_status->bw = RATE_INFO_BW_40;



	if (status->is_ht)

CRA Git | Maintained and supported by SUSTech CRA and CCSE