[PATCH 1/6] staging: rtl8192e: rename structure members to avoid camel case - style
Fix checkpacth warning: Avoid CamelCase by renaming following structure
members of struct chnl_txpow_triple
FirstChnl -> first_chnl
NumChnls -> num_chnls
MaxTxPwrInDbm -> max_tx_pwr_in_dbm
and members for struct rt_dot11d_info
bEnabled -> b_enabled
CountryIelen -> country_ie_len
CountryIeBuf -> country_ie_buf
CountryIeSrcAddr -> country_ie_src_addr
CountryWatchdog -> country_watchdog
MaxTxPwrDbmList -> mac_tx_pwr_dbm_list
State -> state
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.c | 42 +++
drivers/staging/rtl8192e/dot11d.h | 36 +-
2 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index be9a21062a2e..bd41d50b3ad7 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -46,12 +46,12 @@ void dot11d_init(struct rtllib_device *ieee)
{
struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
- pDot11dInfo->bEnabled = false;
+ pDot11dInfo->b_enabled = false;
- pDot11dInfo->State = DOT11D_STATE_NONE;
- pDot11dInfo->CountryIeLen = 0;
+ pDot11dInfo->state = DOT11D_STATE_NONE;
+ pDot11dInfo->country_ie_len = 0;
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
RESET_CIE_WATCHDOG(ieee);
}
EXPORT_SYMBOL(dot11d_init);
@@ -104,13 +104,13 @@ void Dot11d_Reset(struct rtllib_device *ieee)
u32 i;
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
for (i = 1; i <= 11; i++)
(pDot11dInfo->channel_map)[i] = 1;
for (i = 12; i <= 14; i++)
(pDot11dInfo->channel_map)[i] = 2;
- pDot11dInfo->State = DOT11D_STATE_NONE;
- pDot11dInfo->CountryIeLen = 0;
+ pDot11dInfo->state = DOT11D_STATE_NONE;
+ pDot11dInfo->country_ie_len = 0;
RESET_CIE_WATCHDOG(ieee);
}
@@ -122,30 +122,30 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8
*pTaddr,
struct chnl_txpow_triple *pTriple;
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
MaxChnlNum = 0;
NumTriples = (CoutryIeLen - 3) / 3;
pTriple = (struct chnl_txpow_triple *)(pCoutryIe + 3);
for (i = 0; i < NumTriples; i++) {
- if (MaxChnlNum >= pTriple->FirstChnl) {
+ if (MaxChnlNum >= pTriple->first_chnl) {
netdev_info(dev->dev,
"%s: Invalid country IE, skip it..1\n",
__func__);
return;
}
- if (MAX_CHANNEL_NUMBER < (pTriple->FirstChnl +
- pTriple->NumChnls)) {
+ if (MAX_CHANNEL_NUMBER < (pTriple->first_chnl +
+ pTriple->num_chnls)) {
netdev_info(dev->dev,
"%s: Invalid country IE, skip it..2\n",
__func__);
return;
}
- for (j = 0; j < pTriple->NumChnls; j++) {
- pDot11dInfo->channel_map[pTriple->FirstChnl + j] = 1;
- pDot11dInfo->MaxTxPwrDbmList[pTriple->FirstChnl + j] =
-pTriple->MaxTxPowerInDbm;
- MaxChnlNum = pTriple->FirstChnl + j;
+ for (j = 0; j < pTriple->num_chnls; j++) {
+ pDot11dInfo->channel_map[pTriple->first_chnl + j] = 1;
+ pDot11dInfo->max_tx_pwr_dbm_list[pTriple->first_chnl +
j] =
+pTriple->max_tx_power_in_dbm;
+ MaxChnlNum = pTriple->first_chnl + j;
}
pTriple = (struct chnl_txpow_triple *)((u8 *)pTriple + 3);
@@ -153,18 +153,18 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8
*pTaddr,
UPDATE_CIE_SRC(dev, pTaddr);
- pDot11dInfo->CountryIeLen = CoutryIeLen;
- memcpy(pDot11dInfo->CountryIeBuf, pCoutryIe, CoutryIeLen);
- pDot11dInfo->State = DOT11D_STATE_LEARNED;
+ pDot11dInfo->country
[PATCH 3/6] staging: rtl8192e: rename macro arguments to avoid camelcase - style
Fix checkpatch warning: Avoid CamelCase by renaming following macro
arguments
__pIeeeDev -> __p_ieee_dev
__pTa -> __p_ta
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.h | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index 7faf4f67a7bf..0df31c79b5fd 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -58,28 +58,28 @@ static inline void cp_mac_addr(unsigned char *des, unsigned
char *src)
memcpy(des, src, 6);
}
-#define GET_DOT11D_INFO(__pIeeeDev)\
-((struct rt_dot11d_info *)((__pIeeeDev)->pDot11dInfo))
+#define GET_DOT11D_INFO(__p_ieee_dev) \
+((struct rt_dot11d_info *)((__p_ieee_dev)->pDot11dInfo))
-#define IS_DOT11D_ENABLE(__pIeeeDev) \
-(GET_DOT11D_INFO(__pIeeeDev)->b_enabled)
-#define IS_COUNTRY_IE_VALID(__pIeeeDev)\
- (GET_DOT11D_INFO(__pIeeeDev)->country_ie_len > 0)
+#define IS_DOT11D_ENABLE(__p_ieee_dev) \
+(GET_DOT11D_INFO(__p_ieee_dev)->b_enabled)
+#define IS_COUNTRY_IE_VALID(__p_ieee_dev) \
+ (GET_DOT11D_INFO(__p_ieee_dev)->country_ie_len > 0)
-#define IS_EQUAL_CIE_SRC(__pIeeeDev, __pTa)\
+#define IS_EQUAL_CIE_SRC(__p_ieee_dev, __p_ta) \
ether_addr_equal_unaligned( \
- GET_DOT11D_INFO(__pIeeeDev)->country_ie_src_addr, __pTa)
-#define UPDATE_CIE_SRC(__pIeeeDev, __pTa) \
- cp_mac_addr(GET_DOT11D_INFO(__pIeeeDev)->country_ie_src_addr, __pTa)
+ GET_DOT11D_INFO(__p_ieee_dev)->country_ie_src_addr, __p_ta)
+#define UPDATE_CIE_SRC(__p_ieee_dev, __p_ta) \
+ cp_mac_addr(GET_DOT11D_INFO(__p_ieee_dev)->country_ie_src_addr, __p_ta)
-#define GET_CIE_WATCHDOG(__pIeeeDev) \
-(GET_DOT11D_INFO(__pIeeeDev)->country_ie_watchdog)
-static inline void RESET_CIE_WATCHDOG(struct rtllib_device *__pIeeeDev)
+#define GET_CIE_WATCHDOG(__p_ieee_dev) \
+(GET_DOT11D_INFO(__p_ieee_dev)->country_ie_watchdog)
+static inline void RESET_CIE_WATCHDOG(struct rtllib_device *__p_ieee_dev)
{
- GET_CIE_WATCHDOG(__pIeeeDev) = 0;
+ GET_CIE_WATCHDOG(__p_ieee_dev) = 0;
}
-#define UPDATE_CIE_WATCHDOG(__pIeeeDev) (++GET_CIE_WATCHDOG(__pIeeeDev))
+#define UPDATE_CIE_WATCHDOG(__p_ieee_dev) (++GET_CIE_WATCHDOG(__p_ieee_dev))
void dot11d_init(struct rtllib_device *dev);
void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee);
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/6] staging: rtl8192e: rename functions to avoid camelcase -style
Fix checkpatch warning: Avoid CamelCase by renaming following functions
cpMacAddr -> cp_mac_addr
Dot11d_Channelmap -> dot11d_channel_map
Dot11d_Reset -> dot11d_reset
Dot11d_UpdateCountryIe -> dot11d_update_country_ie
DOT11D_ScanComplete -> dot11d_scan_complete
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.c| 12 ++--
drivers/staging/rtl8192e/dot11d.h| 12 ++--
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
drivers/staging/rtl8192e/rtllib_rx.c | 2 +-
drivers/staging/rtl8192e/rtllib_softmac.c| 6 +++---
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index bd41d50b3ad7..5075879d1623 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -56,7 +56,7 @@ void dot11d_init(struct rtllib_device *ieee)
}
EXPORT_SYMBOL(dot11d_init);
-void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device *ieee)
+void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee)
{
int i, max_chan = 14, min_chan = 1;
@@ -96,9 +96,9 @@ void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device
*ieee)
break;
}
}
-EXPORT_SYMBOL(Dot11d_Channelmap);
+EXPORT_SYMBOL(dot11d_channel_map);
-void Dot11d_Reset(struct rtllib_device *ieee)
+void dot11d_reset(struct rtllib_device *ieee)
{
struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
u32 i;
@@ -114,7 +114,7 @@ void Dot11d_Reset(struct rtllib_device *ieee)
RESET_CIE_WATCHDOG(ieee);
}
-void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,
+void dot11d_update_country_ie(struct rtllib_device *dev, u8 *pTaddr,
u16 CoutryIeLen, u8 *pCoutryIe)
{
struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
@@ -158,7 +158,7 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8
*pTaddr,
pDot11dInfo->state = DOT11D_STATE_LEARNED;
}
-void DOT11D_ScanComplete(struct rtllib_device *dev)
+void dot11d_scan_complete(struct rtllib_device *dev)
{
struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
@@ -167,7 +167,7 @@ void DOT11D_ScanComplete(struct rtllib_device *dev)
pDot11dInfo->state = DOT11D_STATE_DONE;
break;
case DOT11D_STATE_DONE:
- Dot11d_Reset(dev);
+ dot11d_reset(dev);
break;
case DOT11D_STATE_NONE:
break;
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index eda43a44c6eb..7faf4f67a7bf 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -53,7 +53,7 @@ struct rt_dot11d_info {
enum dot11d_state state;
};
-static inline void cpMacAddr(unsigned char *des, unsigned char *src)
+static inline void cp_mac_addr(unsigned char *des, unsigned char *src)
{
memcpy(des, src, 6);
}
@@ -70,7 +70,7 @@ static inline void cpMacAddr(unsigned char *des, unsigned
char *src)
ether_addr_equal_unaligned( \
GET_DOT11D_INFO(__pIeeeDev)->country_ie_src_addr, __pTa)
#define UPDATE_CIE_SRC(__pIeeeDev, __pTa) \
- cpMacAddr(GET_DOT11D_INFO(__pIeeeDev)->country_ie_src_addr, __pTa)
+ cp_mac_addr(GET_DOT11D_INFO(__pIeeeDev)->country_ie_src_addr, __pTa)
#define GET_CIE_WATCHDOG(__pIeeeDev) \
(GET_DOT11D_INFO(__pIeeeDev)->country_ie_watchdog)
@@ -82,10 +82,10 @@ static inline void RESET_CIE_WATCHDOG(struct rtllib_device
*__pIeeeDev)
#define UPDATE_CIE_WATCHDOG(__pIeeeDev) (++GET_CIE_WATCHDOG(__pIeeeDev))
void dot11d_init(struct rtllib_device *dev);
-void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device *ieee);
-void Dot11d_Reset(struct rtllib_device *dev);
-void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,
+void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee);
+void dot11d_reset(struct rtllib_device *dev);
+void dot11d_update_country_ie(struct rtllib_device *dev, u8 *pTaddr,
u16 CoutryIeLen, u8 *pCoutryIe);
-void DOT11D_ScanComplete(struct rtllib_device *dev);
+void dot11d_scan_complete(struct rtllib_device *dev);
#endif
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 7031f6833b8b..c145b689175c 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1049,7 +1049,7 @@ static short _rtl92e_get_channel_map(struct net_device
*dev)
}
RT_TRACE(COMP_INIT, "Channel plan is %d\n", priv->ChannelPlan);
dot11d_init(priv->rtllib);
- Dot11d_Channelmap(priv->ChannelPlan, priv->rtllib);
+ dot11d_channel_map(priv->ChannelPlan, priv->rtllib);
for (i = 1; i
[PATCH 6/6] staging: rtl8192e: rename structure members to avoid camelcase - style
Fix checkpatch warning: Avoid CamelCase by renaming following structure
members of struct rtllib_device
pDot11dInfo -> p_dot11d_info
bGlobalDomain -> b_global_domain
IbssStartChnl -> ibss_start_chnl
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.c | 66 ---
drivers/staging/rtl8192e/dot11d.h | 4 +-
drivers/staging/rtl8192e/rtllib.h | 6 +--
drivers/staging/rtl8192e/rtllib_softmac.c | 12 ++---
4 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index c2040f23dbd4..82b9605f7aed 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -44,14 +44,15 @@ static struct channel_list channel_array[] = {
void dot11d_init(struct rtllib_device *ieee)
{
- struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
+ struct rt_dot11d_info *p_dot11d_info = GET_DOT11D_INFO(ieee);
- pDot11dInfo->b_enabled = false;
+ p_dot11d_info->b_enabled = false;
- pDot11dInfo->state = DOT11D_STATE_NONE;
- pDot11dInfo->country_ie_len = 0;
- memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ p_dot11d_info->state = DOT11D_STATE_NONE;
+ p_dot11d_info->country_ie_len = 0;
+ memset(p_dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
+ memset(p_dot11d_info->max_tx_pwr_dbm_list, 0xFF,
+ MAX_CHANNEL_NUMBER + 1);
RESET_CIE_WATCHDOG(ieee);
}
EXPORT_SYMBOL(dot11d_init);
@@ -60,7 +61,7 @@ void dot11d_channel_map(u8 channel_plan, struct rtllib_device
*ieee)
{
int i, max_chan = 14, min_chan = 1;
- ieee->bGlobalDomain = false;
+ ieee->b_global_domain = false;
if (channel_array[channel_plan].len != 0) {
memset(GET_DOT11D_INFO(ieee)->channel_map, 0,
@@ -76,22 +77,22 @@ void dot11d_channel_map(u8 channel_plan, struct
rtllib_device *ieee)
switch (channel_plan) {
case COUNTRY_CODE_GLOBAL_DOMAIN:
- ieee->bGlobalDomain = true;
+ ieee->b_global_domain = true;
for (i = 12; i <= 14; i++)
GET_DOT11D_INFO(ieee)->channel_map[i] = 2;
- ieee->IbssStartChnl = 10;
+ ieee->ibss_start_chnl = 10;
ieee->ibss_maxjoin_chal = 11;
break;
case COUNTRY_CODE_WORLD_WIDE_13:
for (i = 12; i <= 13; i++)
GET_DOT11D_INFO(ieee)->channel_map[i] = 2;
- ieee->IbssStartChnl = 10;
+ ieee->ibss_start_chnl = 10;
ieee->ibss_maxjoin_chal = 11;
break;
default:
- ieee->IbssStartChnl = 1;
+ ieee->ibss_start_chnl = 1;
ieee->ibss_maxjoin_chal = 14;
break;
}
@@ -100,29 +101,31 @@ EXPORT_SYMBOL(dot11d_channel_map);
void dot11d_reset(struct rtllib_device *ieee)
{
- struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
+ struct rt_dot11d_info *p_dot11d_info = GET_DOT11D_INFO(ieee);
u32 i;
- memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(p_dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
+ memset(p_dot11d_info->max_tx_pwr_dbm_list, 0xFF,
+ MAX_CHANNEL_NUMBER + 1);
for (i = 1; i <= 11; i++)
- (pDot11dInfo->channel_map)[i] = 1;
+ (p_dot11d_info->channel_map)[i] = 1;
for (i = 12; i <= 14; i++)
- (pDot11dInfo->channel_map)[i] = 2;
- pDot11dInfo->state = DOT11D_STATE_NONE;
- pDot11dInfo->country_ie_len = 0;
+ (p_dot11d_info->channel_map)[i] = 2;
+ p_dot11d_info->state = DOT11D_STATE_NONE;
+ p_dot11d_info->country_ie_len = 0;
RESET_CIE_WATCHDOG(ieee);
}
void dot11d_update_country_ie(struct rtllib_device *dev, u8 *p_taddr,
- u16 coutry_ie_len, u8 *p_coutry_ie)
+ u16 coutry_ie_len, u8 *p_coutry_ie)
{
- struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
+ struct rt_dot11d_info *p_dot11d_info = GET_DOT11D_INFO(dev);
u8 i, j, num_triples, max_chnl_num;
struct chnl_txpow_triple *p_triple;
- memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(p_dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
+ memset(p_dot11d_info->max_tx_pwr_dbm_list, 0xFF,
+ MAX_CHANNEL_NUMBER + 1);
max_chnl_
[PATCH 4/6] staging: rtl8192e: rename function parameters to avoid camelcase - style
Fix checkpatch warning: Avoid CamelCase by renaming following parameters of
function dot11d_update_country_ie
pTaddr -> p_taddr
CoutryIeLen -> coutry_ie_len
pCoutryIe -> p_coutry_ie
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.c | 14 +++---
drivers/staging/rtl8192e/dot11d.h | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index 5075879d1623..12dd866af63c 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -114,8 +114,8 @@ void dot11d_reset(struct rtllib_device *ieee)
RESET_CIE_WATCHDOG(ieee);
}
-void dot11d_update_country_ie(struct rtllib_device *dev, u8 *pTaddr,
- u16 CoutryIeLen, u8 *pCoutryIe)
+void dot11d_update_country_ie(struct rtllib_device *dev, u8 *p_taddr,
+ u16 coutry_ie_len, u8 *p_coutry_ie)
{
struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
u8 i, j, NumTriples, MaxChnlNum;
@@ -124,8 +124,8 @@ void dot11d_update_country_ie(struct rtllib_device *dev, u8
*pTaddr,
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
MaxChnlNum = 0;
- NumTriples = (CoutryIeLen - 3) / 3;
- pTriple = (struct chnl_txpow_triple *)(pCoutryIe + 3);
+ NumTriples = (coutry_ie_len - 3) / 3;
+ pTriple = (struct chnl_txpow_triple *)(p_coutry_ie + 3);
for (i = 0; i < NumTriples; i++) {
if (MaxChnlNum >= pTriple->first_chnl) {
netdev_info(dev->dev,
@@ -151,10 +151,10 @@ void dot11d_update_country_ie(struct rtllib_device *dev,
u8 *pTaddr,
pTriple = (struct chnl_txpow_triple *)((u8 *)pTriple + 3);
}
- UPDATE_CIE_SRC(dev, pTaddr);
+ UPDATE_CIE_SRC(dev, p_taddr);
- pDot11dInfo->country_ie_len = CoutryIeLen;
- memcpy(pDot11dInfo->country_ie_buf, pCoutryIe, CoutryIeLen);
+ pDot11dInfo->country_ie_len = coutry_ie_len;
+ memcpy(pDot11dInfo->country_ie_buf, p_coutry_ie, coutry_ie_len);
pDot11dInfo->state = DOT11D_STATE_LEARNED;
}
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index 0df31c79b5fd..ae2389efdff7 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -84,8 +84,8 @@ static inline void RESET_CIE_WATCHDOG(struct rtllib_device
*__p_ieee_dev)
void dot11d_init(struct rtllib_device *dev);
void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee);
void dot11d_reset(struct rtllib_device *dev);
-void dot11d_update_country_ie(struct rtllib_device *dev, u8 *pTaddr,
- u16 CoutryIeLen, u8 *pCoutryIe);
+void dot11d_update_country_ie(struct rtllib_device *dev, u8 *p_taddr,
+ u16 coutry_ie_len, u8 *p_coutry_ie);
void dot11d_scan_complete(struct rtllib_device *dev);
#endif
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 5/6] staging: rtl8192e: rename local variables to avoid camelcase - style
Fix checkpatch warning: Avoid CameCase by renaming following local
variables of function dot11d_update_country_ie
NumTriples -> num_triples
MaxChnlNum -> max_chnl_num
pTriple -> p_triple
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.c | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index 12dd866af63c..c2040f23dbd4 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -118,37 +118,37 @@ void dot11d_update_country_ie(struct rtllib_device *dev,
u8 *p_taddr,
u16 coutry_ie_len, u8 *p_coutry_ie)
{
struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
- u8 i, j, NumTriples, MaxChnlNum;
- struct chnl_txpow_triple *pTriple;
+ u8 i, j, num_triples, max_chnl_num;
+ struct chnl_txpow_triple *p_triple;
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
memset(pDot11dInfo->max_tx_pwr_dbm_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
- MaxChnlNum = 0;
- NumTriples = (coutry_ie_len - 3) / 3;
- pTriple = (struct chnl_txpow_triple *)(p_coutry_ie + 3);
- for (i = 0; i < NumTriples; i++) {
- if (MaxChnlNum >= pTriple->first_chnl) {
+ max_chnl_num = 0;
+ num_triples = (coutry_ie_len - 3) / 3;
+ p_triple = (struct chnl_txpow_triple *)(p_coutry_ie + 3);
+ for (i = 0; i < num_triples; i++) {
+ if (max_chnl_num >= p_triple->first_chnl) {
netdev_info(dev->dev,
"%s: Invalid country IE, skip it..1\n",
__func__);
return;
}
- if (MAX_CHANNEL_NUMBER < (pTriple->first_chnl +
- pTriple->num_chnls)) {
+ if (MAX_CHANNEL_NUMBER < (p_triple->first_chnl +
+ p_triple->num_chnls)) {
netdev_info(dev->dev,
"%s: Invalid country IE, skip it..2\n",
__func__);
return;
}
- for (j = 0; j < pTriple->num_chnls; j++) {
- pDot11dInfo->channel_map[pTriple->first_chnl + j] = 1;
- pDot11dInfo->max_tx_pwr_dbm_list[pTriple->first_chnl +
j] =
-pTriple->max_tx_power_in_dbm;
- MaxChnlNum = pTriple->first_chnl + j;
+ for (j = 0; j < p_triple->num_chnls; j++) {
+ pDot11dInfo->channel_map[p_triple->first_chnl + j] = 1;
+ pDot11dInfo->max_tx_pwr_dbm_list[p_triple->first_chnl +
j] =
+p_triple->max_tx_power_in_dbm;
+ max_chnl_num = p_triple->first_chnl + j;
}
- pTriple = (struct chnl_txpow_triple *)((u8 *)pTriple + 3);
+ p_triple = (struct chnl_txpow_triple *)((u8 *)p_triple + 3);
}
UPDATE_CIE_SRC(dev, p_taddr);
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/3] staging: rtl8192e: rename members of struct chnl_txpow_triple - style
Rename following members of struct chnl_txpow_triple to avoid
checkpatch warning: Avoid CamelCase
FirstChnl -> first_chnl
NumChnls -> num_chnls
MaxTxPwrInDbm -> max_tx_power
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.c | 16
drivers/staging/rtl8192e/dot11d.h | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index be9a21062a2e..711e8264183e 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -127,25 +127,25 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8
*pTaddr,
NumTriples = (CoutryIeLen - 3) / 3;
pTriple = (struct chnl_txpow_triple *)(pCoutryIe + 3);
for (i = 0; i < NumTriples; i++) {
- if (MaxChnlNum >= pTriple->FirstChnl) {
+ if (MaxChnlNum >= pTriple->first_chnl) {
netdev_info(dev->dev,
"%s: Invalid country IE, skip it..1\n",
__func__);
return;
}
- if (MAX_CHANNEL_NUMBER < (pTriple->FirstChnl +
- pTriple->NumChnls)) {
+ if (MAX_CHANNEL_NUMBER < (pTriple->first_chnl +
+ pTriple->num_chnls)) {
netdev_info(dev->dev,
"%s: Invalid country IE, skip it..2\n",
__func__);
return;
}
- for (j = 0; j < pTriple->NumChnls; j++) {
- pDot11dInfo->channel_map[pTriple->FirstChnl + j] = 1;
- pDot11dInfo->MaxTxPwrDbmList[pTriple->FirstChnl + j] =
-pTriple->MaxTxPowerInDbm;
- MaxChnlNum = pTriple->FirstChnl + j;
+ for (j = 0; j < pTriple->num_chnls; j++) {
+ pDot11dInfo->channel_map[pTriple->first_chnl + j] = 1;
+ pDot11dInfo->MaxTxPwrDbmList[pTriple->first_chnl + j] =
+pTriple->max_tx_power;
+ MaxChnlNum = pTriple->first_chnl + j;
}
pTriple = (struct chnl_txpow_triple *)((u8 *)pTriple + 3);
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index 7fa3c4d963c4..921e83e3dd47 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -18,9 +18,9 @@
#include "rtllib.h"
struct chnl_txpow_triple {
- u8 FirstChnl;
- u8 NumChnls;
- u8 MaxTxPowerInDbm;
+ u8 first_chnl;
+ u8 num_chnls;
+ u8 max_tx_power;
};
enum dot11d_state {
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/3] staging: rtl8192e: rename members of struct rt_dot11d_info - style
Rename following members of struct rt_dot11d_info to avoid checkpatch
warning: Avoid CamelCase
bEnabled -> enabled
CountryIelen -> country_len
CountryIeBuf -> country_buffer
CountryIeSrcAddr -> country_src_addr
CountryIeWatchdog -> country_watchdog
MaxTxPwrDbmList -> mac_tx_power_list
State -> state
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.c | 28 ++--
drivers/staging/rtl8192e/dot11d.h | 30 +++---
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index 711e8264183e..7e489f0f3c41 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -46,12 +46,12 @@ void dot11d_init(struct rtllib_device *ieee)
{
struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
- pDot11dInfo->bEnabled = false;
+ pDot11dInfo->enabled = false;
- pDot11dInfo->State = DOT11D_STATE_NONE;
- pDot11dInfo->CountryIeLen = 0;
+ pDot11dInfo->state = DOT11D_STATE_NONE;
+ pDot11dInfo->country_len = 0;
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(pDot11dInfo->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
RESET_CIE_WATCHDOG(ieee);
}
EXPORT_SYMBOL(dot11d_init);
@@ -104,13 +104,13 @@ void Dot11d_Reset(struct rtllib_device *ieee)
u32 i;
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(pDot11dInfo->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
for (i = 1; i <= 11; i++)
(pDot11dInfo->channel_map)[i] = 1;
for (i = 12; i <= 14; i++)
(pDot11dInfo->channel_map)[i] = 2;
- pDot11dInfo->State = DOT11D_STATE_NONE;
- pDot11dInfo->CountryIeLen = 0;
+ pDot11dInfo->state = DOT11D_STATE_NONE;
+ pDot11dInfo->country_len = 0;
RESET_CIE_WATCHDOG(ieee);
}
@@ -122,7 +122,7 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8
*pTaddr,
struct chnl_txpow_triple *pTriple;
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(pDot11dInfo->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
MaxChnlNum = 0;
NumTriples = (CoutryIeLen - 3) / 3;
pTriple = (struct chnl_txpow_triple *)(pCoutryIe + 3);
@@ -143,7 +143,7 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8
*pTaddr,
for (j = 0; j < pTriple->num_chnls; j++) {
pDot11dInfo->channel_map[pTriple->first_chnl + j] = 1;
- pDot11dInfo->MaxTxPwrDbmList[pTriple->first_chnl + j] =
+ pDot11dInfo->max_tx_power_list[pTriple->first_chnl + j]
=
pTriple->max_tx_power;
MaxChnlNum = pTriple->first_chnl + j;
}
@@ -153,18 +153,18 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8
*pTaddr,
UPDATE_CIE_SRC(dev, pTaddr);
- pDot11dInfo->CountryIeLen = CoutryIeLen;
- memcpy(pDot11dInfo->CountryIeBuf, pCoutryIe, CoutryIeLen);
- pDot11dInfo->State = DOT11D_STATE_LEARNED;
+ pDot11dInfo->country_len = CoutryIeLen;
+ memcpy(pDot11dInfo->country_buffer, pCoutryIe, CoutryIeLen);
+ pDot11dInfo->state = DOT11D_STATE_LEARNED;
}
void DOT11D_ScanComplete(struct rtllib_device *dev)
{
struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
- switch (pDot11dInfo->State) {
+ switch (pDot11dInfo->state) {
case DOT11D_STATE_LEARNED:
- pDot11dInfo->State = DOT11D_STATE_DONE;
+ pDot11dInfo->state = DOT11D_STATE_DONE;
break;
case DOT11D_STATE_DONE:
Dot11d_Reset(dev);
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index 921e83e3dd47..9e5aca6ad9de 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -30,27 +30,27 @@ enum dot11d_state {
};
/**
- * struct rt_dot11d_info * @CountryIeLen: value greater than 0 if
- * @CountryIeBuf contains valid country information element.
+ * struct rt_dot11d_info * @country_len: value greater than 0 if
+ * @country_buffer contains valid country information element.
* @channel_map: holds channel values
* 0 - invalid,
* 1 - valid (active scan),
* 2 - valid (passive scan)
- * @CountryIeSrcAddr - Source AP of the cou
[PATCH 3/3] staging: rtl8192e: rename members of struct rtllib_device - style
Rename following members of struct rtllib_device to fix checkpatch
warning: Avoid CamelCase
pDot11dInfo -> dot11d_info
bGlobalDomain -> global_domain
IbssStartChnl -> ibss_start_chnl
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.c | 58 +++
drivers/staging/rtl8192e/dot11d.h | 2 +-
drivers/staging/rtl8192e/rtllib.h | 6 +--
drivers/staging/rtl8192e/rtllib_softmac.c | 12 ++---
4 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index 7e489f0f3c41..ccf9c161aa7c 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -44,14 +44,14 @@ static struct channel_list channel_array[] = {
void dot11d_init(struct rtllib_device *ieee)
{
- struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
+ struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(ieee);
- pDot11dInfo->enabled = false;
+ dot11d_info->enabled = false;
- pDot11dInfo->state = DOT11D_STATE_NONE;
- pDot11dInfo->country_len = 0;
- memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ dot11d_info->state = DOT11D_STATE_NONE;
+ dot11d_info->country_len = 0;
+ memset(dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
+ memset(dot11d_info->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
RESET_CIE_WATCHDOG(ieee);
}
EXPORT_SYMBOL(dot11d_init);
@@ -60,7 +60,7 @@ void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device
*ieee)
{
int i, max_chan = 14, min_chan = 1;
- ieee->bGlobalDomain = false;
+ ieee->global_domain = false;
if (channel_array[channel_plan].len != 0) {
memset(GET_DOT11D_INFO(ieee)->channel_map, 0,
@@ -76,22 +76,22 @@ void Dot11d_Channelmap(u8 channel_plan, struct
rtllib_device *ieee)
switch (channel_plan) {
case COUNTRY_CODE_GLOBAL_DOMAIN:
- ieee->bGlobalDomain = true;
+ ieee->global_domain = true;
for (i = 12; i <= 14; i++)
GET_DOT11D_INFO(ieee)->channel_map[i] = 2;
- ieee->IbssStartChnl = 10;
+ ieee->ibss_start_chnl = 10;
ieee->ibss_maxjoin_chal = 11;
break;
case COUNTRY_CODE_WORLD_WIDE_13:
for (i = 12; i <= 13; i++)
GET_DOT11D_INFO(ieee)->channel_map[i] = 2;
- ieee->IbssStartChnl = 10;
+ ieee->ibss_start_chnl = 10;
ieee->ibss_maxjoin_chal = 11;
break;
default:
- ieee->IbssStartChnl = 1;
+ ieee->ibss_start_chnl = 1;
ieee->ibss_maxjoin_chal = 14;
break;
}
@@ -100,29 +100,29 @@ EXPORT_SYMBOL(Dot11d_Channelmap);
void Dot11d_Reset(struct rtllib_device *ieee)
{
- struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
+ struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(ieee);
u32 i;
- memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
+ memset(dot11d_info->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
for (i = 1; i <= 11; i++)
- (pDot11dInfo->channel_map)[i] = 1;
+ (dot11d_info->channel_map)[i] = 1;
for (i = 12; i <= 14; i++)
- (pDot11dInfo->channel_map)[i] = 2;
- pDot11dInfo->state = DOT11D_STATE_NONE;
- pDot11dInfo->country_len = 0;
+ (dot11d_info->channel_map)[i] = 2;
+ dot11d_info->state = DOT11D_STATE_NONE;
+ dot11d_info->country_len = 0;
RESET_CIE_WATCHDOG(ieee);
}
void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,
u16 CoutryIeLen, u8 *pCoutryIe)
{
- struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
+ struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(dev);
u8 i, j, NumTriples, MaxChnlNum;
struct chnl_txpow_triple *pTriple;
- memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
+ memset(dot11d_info->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
MaxChnlNum = 0;
NumTriples = (CoutryIeLen - 3) / 3;
pTriple = (struct chnl_txpow_triple *)(pCoutryIe + 3);
@@ -142,8 +142,8 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8
*pTaddr,
Re: [PATCH 1/3] staging: rtl8192e: rename members of struct chnl_txpow_triple - style
On 05/02/19 11:51 PM, Greg KH wrote: On Tue, Feb 05, 2019 at 09:42:37AM -0800, Himadri Pandya wrote: Rename following members of struct chnl_txpow_triple to avoid checkpatch warning: Avoid CamelCase FirstChnl -> first_chnl NumChnls -> num_chnls We do have vowels, how about "first_channel" and "num_channels"? Much easier to read and understand, especially for non-native-english speakers, right? Yeah. Such names would make more sense. Doing it in V2. Thank you. - Himadri ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 2/3] staging: rtl8192e: rename members of struct rt_dot11d_info - style
On 05/02/19 11:53 PM, Greg KH wrote: On Tue, Feb 05, 2019 at 09:42:38AM -0800, Himadri Pandya wrote: Rename following members of struct rt_dot11d_info to avoid checkpatch warning: Avoid CamelCase bEnabled -> enabled CountryIelen -> country_len CountryIeBuf -> country_buffer CountryIeSrcAddr -> country_src_addr CountryIeWatchdog -> country_watchdog MaxTxPwrDbmList -> mac_tx_power_list "max_tx_power_list"? Yes. My bad. Apologies. Fixing it in V2. - Himadri ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 3/3] staging: rtl8192e: rename members of struct rtllib_device - style
On 05/02/19 11:52 PM, Greg KH wrote: On Tue, Feb 05, 2019 at 07:22:11PM +0100, Greg KH wrote: On Tue, Feb 05, 2019 at 09:42:39AM -0800, Himadri Pandya wrote: Rename following members of struct rtllib_device to fix checkpatch warning: Avoid CamelCase pDot11dInfo -> dot11d_info bGlobalDomain -> global_domain IbssStartChnl -> ibss_start_chnl Why the use of tabs on the first line and not on the others? Anyway, same comment here, "ibss_start_channel"? Oops, no, it should be "bss_start_channel", no need for the initial "i", that was left over from the horrid notation style. Noted. Renaming it to "bss_start_channel" in V2. Thank you. - Himadri ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/3] staging: rtl8192e: rename members of struct chnl_txpow_triple - style
Rename following members of chnl_txpow_triple to fix checkpatch
warning: Avoid CamelCase
FirstChnl -> first_channel
NumChnls -> num_channels
MaxTxPowerInDbm -> max_tx_power
Signed-off-by: Himadri Pandya
---
Changes in V2:
Rename "FirstChnl" to "first_channel" instead of "first_chnl" and rename
"NumChnls" to "num_channels" instead of "num_chnls" in order to make
them more readable and understandable for non-native english speakers.
---
drivers/staging/rtl8192e/dot11d.c | 16
drivers/staging/rtl8192e/dot11d.h | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index be9a21062a2e..76a9e07ec90f 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -127,25 +127,25 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8
*pTaddr,
NumTriples = (CoutryIeLen - 3) / 3;
pTriple = (struct chnl_txpow_triple *)(pCoutryIe + 3);
for (i = 0; i < NumTriples; i++) {
- if (MaxChnlNum >= pTriple->FirstChnl) {
+ if (MaxChnlNum >= pTriple->first_channel) {
netdev_info(dev->dev,
"%s: Invalid country IE, skip it..1\n",
__func__);
return;
}
- if (MAX_CHANNEL_NUMBER < (pTriple->FirstChnl +
- pTriple->NumChnls)) {
+ if (MAX_CHANNEL_NUMBER < (pTriple->first_channel +
+ pTriple->num_channels)) {
netdev_info(dev->dev,
"%s: Invalid country IE, skip it..2\n",
__func__);
return;
}
- for (j = 0; j < pTriple->NumChnls; j++) {
- pDot11dInfo->channel_map[pTriple->FirstChnl + j] = 1;
- pDot11dInfo->MaxTxPwrDbmList[pTriple->FirstChnl + j] =
-pTriple->MaxTxPowerInDbm;
- MaxChnlNum = pTriple->FirstChnl + j;
+ for (j = 0; j < pTriple->num_channels; j++) {
+ pDot11dInfo->channel_map[pTriple->first_channel + j] =
1;
+ pDot11dInfo->MaxTxPwrDbmList[pTriple->first_channel +
j] =
+pTriple->max_tx_power;
+ MaxChnlNum = pTriple->first_channel + j;
}
pTriple = (struct chnl_txpow_triple *)((u8 *)pTriple + 3);
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index 7fa3c4d963c4..e007295fe9d0 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -18,9 +18,9 @@
#include "rtllib.h"
struct chnl_txpow_triple {
- u8 FirstChnl;
- u8 NumChnls;
- u8 MaxTxPowerInDbm;
+ u8 first_channel;
+ u8 num_channels;
+ u8 max_tx_power;
};
enum dot11d_state {
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 3/3] staging: rtl8192e: rename members of struct rtllib_device - style
Rename following members of struct rtllib_device to fix checkpatch
warning: Avoid CamelCase
pDot11dInfo -> dot11d_info
bGlobalDomain -> global_domain
IbssStartChnl -> bss_start_channel
Signed-off-by: Himadri Pandya
---
Changes in V2:
Rename "IbssStartChnl" to "bss_start_channel" instead of
"ibss_start_chnl" in order to remove the "i" from the beginning of
the name and include full spelling of "channel" to make it more readable
and understandable.
---
drivers/staging/rtl8192e/dot11d.c | 58 +++
drivers/staging/rtl8192e/dot11d.h | 2 +-
drivers/staging/rtl8192e/rtllib.h | 6 +--
drivers/staging/rtl8192e/rtllib_softmac.c | 12 ++---
4 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index 764e798a84c0..6c26af3f377f 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -44,14 +44,14 @@ static struct channel_list channel_array[] = {
void dot11d_init(struct rtllib_device *ieee)
{
- struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
+ struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(ieee);
- pDot11dInfo->enabled = false;
+ dot11d_info->enabled = false;
- pDot11dInfo->state = DOT11D_STATE_NONE;
- pDot11dInfo->country_len = 0;
- memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ dot11d_info->state = DOT11D_STATE_NONE;
+ dot11d_info->country_len = 0;
+ memset(dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
+ memset(dot11d_info->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
RESET_CIE_WATCHDOG(ieee);
}
EXPORT_SYMBOL(dot11d_init);
@@ -60,7 +60,7 @@ void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device
*ieee)
{
int i, max_chan = 14, min_chan = 1;
- ieee->bGlobalDomain = false;
+ ieee->global_domain = false;
if (channel_array[channel_plan].len != 0) {
memset(GET_DOT11D_INFO(ieee)->channel_map, 0,
@@ -76,22 +76,22 @@ void Dot11d_Channelmap(u8 channel_plan, struct
rtllib_device *ieee)
switch (channel_plan) {
case COUNTRY_CODE_GLOBAL_DOMAIN:
- ieee->bGlobalDomain = true;
+ ieee->global_domain = true;
for (i = 12; i <= 14; i++)
GET_DOT11D_INFO(ieee)->channel_map[i] = 2;
- ieee->IbssStartChnl = 10;
+ ieee->bss_start_channel = 10;
ieee->ibss_maxjoin_chal = 11;
break;
case COUNTRY_CODE_WORLD_WIDE_13:
for (i = 12; i <= 13; i++)
GET_DOT11D_INFO(ieee)->channel_map[i] = 2;
- ieee->IbssStartChnl = 10;
+ ieee->bss_start_channel = 10;
ieee->ibss_maxjoin_chal = 11;
break;
default:
- ieee->IbssStartChnl = 1;
+ ieee->bss_start_channel = 1;
ieee->ibss_maxjoin_chal = 14;
break;
}
@@ -100,29 +100,29 @@ EXPORT_SYMBOL(Dot11d_Channelmap);
void Dot11d_Reset(struct rtllib_device *ieee)
{
- struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
+ struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(ieee);
u32 i;
- memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
+ memset(dot11d_info->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
for (i = 1; i <= 11; i++)
- (pDot11dInfo->channel_map)[i] = 1;
+ (dot11d_info->channel_map)[i] = 1;
for (i = 12; i <= 14; i++)
- (pDot11dInfo->channel_map)[i] = 2;
- pDot11dInfo->state = DOT11D_STATE_NONE;
- pDot11dInfo->country_len = 0;
+ (dot11d_info->channel_map)[i] = 2;
+ dot11d_info->state = DOT11D_STATE_NONE;
+ dot11d_info->country_len = 0;
RESET_CIE_WATCHDOG(ieee);
}
void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,
u16 CoutryIeLen, u8 *pCoutryIe)
{
- struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
+ struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(dev);
u8 i, j, NumTriples, MaxChnlNum;
struct chnl_txpow_triple *pTriple;
- memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
+ memset(dot11d_in
[PATCH v2 2/3] staging: rtl8192e: rename members of struct rt_dot11d_info - style
Rename following members of struct rt_dot11d_info to fix checkpatch
warning: Avoid Camelcase
bEnabled -> enabled
CountryIeLen -> country_len
CountryIeBuf -> country_buffer
CountryIeSrcAddr -> country_src_addr
CountryIeWatchdog -> country_watchdog
MaxTxPwrDbmList -> max_tx_power_list
State -> state
Signed-off-by: Himadri Pandya
---
Changes in V2:
Fix typo in new name "max_tx_power_list" in commit
message(mac_tx_power_list -> max_tx_power_list).
---
drivers/staging/rtl8192e/dot11d.c | 28 ++--
drivers/staging/rtl8192e/dot11d.h | 30 +++---
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index 76a9e07ec90f..764e798a84c0 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -46,12 +46,12 @@ void dot11d_init(struct rtllib_device *ieee)
{
struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
- pDot11dInfo->bEnabled = false;
+ pDot11dInfo->enabled = false;
- pDot11dInfo->State = DOT11D_STATE_NONE;
- pDot11dInfo->CountryIeLen = 0;
+ pDot11dInfo->state = DOT11D_STATE_NONE;
+ pDot11dInfo->country_len = 0;
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(pDot11dInfo->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
RESET_CIE_WATCHDOG(ieee);
}
EXPORT_SYMBOL(dot11d_init);
@@ -104,13 +104,13 @@ void Dot11d_Reset(struct rtllib_device *ieee)
u32 i;
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(pDot11dInfo->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
for (i = 1; i <= 11; i++)
(pDot11dInfo->channel_map)[i] = 1;
for (i = 12; i <= 14; i++)
(pDot11dInfo->channel_map)[i] = 2;
- pDot11dInfo->State = DOT11D_STATE_NONE;
- pDot11dInfo->CountryIeLen = 0;
+ pDot11dInfo->state = DOT11D_STATE_NONE;
+ pDot11dInfo->country_len = 0;
RESET_CIE_WATCHDOG(ieee);
}
@@ -122,7 +122,7 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8
*pTaddr,
struct chnl_txpow_triple *pTriple;
memset(pDot11dInfo->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
- memset(pDot11dInfo->MaxTxPwrDbmList, 0xFF, MAX_CHANNEL_NUMBER + 1);
+ memset(pDot11dInfo->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
MaxChnlNum = 0;
NumTriples = (CoutryIeLen - 3) / 3;
pTriple = (struct chnl_txpow_triple *)(pCoutryIe + 3);
@@ -143,7 +143,7 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8
*pTaddr,
for (j = 0; j < pTriple->num_channels; j++) {
pDot11dInfo->channel_map[pTriple->first_channel + j] =
1;
- pDot11dInfo->MaxTxPwrDbmList[pTriple->first_channel +
j] =
+ pDot11dInfo->max_tx_power_list[pTriple->first_channel +
j] =
pTriple->max_tx_power;
MaxChnlNum = pTriple->first_channel + j;
}
@@ -153,18 +153,18 @@ void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8
*pTaddr,
UPDATE_CIE_SRC(dev, pTaddr);
- pDot11dInfo->CountryIeLen = CoutryIeLen;
- memcpy(pDot11dInfo->CountryIeBuf, pCoutryIe, CoutryIeLen);
- pDot11dInfo->State = DOT11D_STATE_LEARNED;
+ pDot11dInfo->country_len = CoutryIeLen;
+ memcpy(pDot11dInfo->country_buffer, pCoutryIe, CoutryIeLen);
+ pDot11dInfo->state = DOT11D_STATE_LEARNED;
}
void DOT11D_ScanComplete(struct rtllib_device *dev)
{
struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(dev);
- switch (pDot11dInfo->State) {
+ switch (pDot11dInfo->state) {
case DOT11D_STATE_LEARNED:
- pDot11dInfo->State = DOT11D_STATE_DONE;
+ pDot11dInfo->state = DOT11D_STATE_DONE;
break;
case DOT11D_STATE_DONE:
Dot11d_Reset(dev);
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index e007295fe9d0..015f77841065 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -30,27 +30,27 @@ enum dot11d_state {
};
/**
- * struct rt_dot11d_info * @CountryIeLen: value greater than 0 if
- * @CountryIeBuf contains valid country information element.
+ * struct rt_dot11d_info * @country_len: value greater than 0 if
+ * @country_buffer contains valid country information element.
* @channel_map: holds channel values
[PATCH 5/8] staging: rtl8192e: rename function DOT11D_ScanComplete to dot11d_scan_complete - style
Rename function DOT11D_ScanComplete to dot11d_scan_complete to fix
checkpatch warning: Avoid CamelCase.
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.c | 2 +-
drivers/staging/rtl8192e/dot11d.h | 2 +-
drivers/staging/rtl8192e/rtllib_softmac.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index 5e5d1b4bf33f..3e66e01138db 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -158,7 +158,7 @@ void dot11d_update_country(struct rtllib_device *dev, u8
*pTaddr,
dot11d_info->state = DOT11D_STATE_LEARNED;
}
-void DOT11D_ScanComplete(struct rtllib_device *dev)
+void dot11d_scan_complete(struct rtllib_device *dev)
{
struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(dev);
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index 9f0c2634520b..b0b5115bd4e2 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -86,6 +86,6 @@ void dot11d_channel_map(u8 channel_plan, struct rtllib_device
*ieee);
void dot11d_reset(struct rtllib_device *dev);
void dot11d_update_country(struct rtllib_device *dev, u8 *pTaddr,
u16 CoutryIeLen, u8 *pCoutryIe);
-void DOT11D_ScanComplete(struct rtllib_device *dev);
+void dot11d_scan_complete(struct rtllib_device *dev);
#endif
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c
b/drivers/staging/rtl8192e/rtllib_softmac.c
index 9752fda840d4..ee275857868f 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -564,7 +564,7 @@ static void rtllib_softmac_scan_syncro(struct rtllib_device
*ieee, u8 is_mesh)
if (ieee->state >= RTLLIB_LINKED) {
if (IS_DOT11D_ENABLE(ieee))
- DOT11D_ScanComplete(ieee);
+ dot11d_scan_complete(ieee);
}
mutex_unlock(&ieee->scan_mutex);
@@ -623,7 +623,7 @@ static void rtllib_softmac_scan_wq(void *data)
out:
if (IS_DOT11D_ENABLE(ieee))
- DOT11D_ScanComplete(ieee);
+ dot11d_scan_complete(ieee);
ieee->current_network.channel = last_channel;
out1:
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 7/8] staging: rtl8192e: rename parameters of function dot11d_update_country - style
Rename following parameters of function dot11d_update_country to fix
checkpatch warning: Avoid CamelCase and make the parameter names more
readable, understandable.
pTaddr -> address
CoutryIeLen -> country_len
pCoutryIe -> country
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.c | 14 +++---
drivers/staging/rtl8192e/dot11d.h | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index fdf6d951384c..68f53013cb95 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -114,8 +114,8 @@ void dot11d_reset(struct rtllib_device *ieee)
RESET_CIE_WATCHDOG(ieee);
}
-void dot11d_update_country(struct rtllib_device *dev, u8 *pTaddr,
- u16 CoutryIeLen, u8 *pCoutryIe)
+void dot11d_update_country(struct rtllib_device *dev, u8 *address,
+ u16 country_len, u8 *country)
{
struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(dev);
u8 i, j, number_of_triples, max_channel_number;
@@ -124,8 +124,8 @@ void dot11d_update_country(struct rtllib_device *dev, u8
*pTaddr,
memset(dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
memset(dot11d_info->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
max_channel_number = 0;
- number_of_triples = (CoutryIeLen - 3) / 3;
- triple = (struct chnl_txpow_triple *)(pCoutryIe + 3);
+ number_of_triples = (country_len - 3) / 3;
+ triple = (struct chnl_txpow_triple *)(country + 3);
for (i = 0; i < number_of_triples; i++) {
if (max_channel_number >= triple->first_channel) {
netdev_info(dev->dev,
@@ -151,10 +151,10 @@ void dot11d_update_country(struct rtllib_device *dev, u8
*pTaddr,
triple = (struct chnl_txpow_triple *)((u8 *)triple + 3);
}
- UPDATE_CIE_SRC(dev, pTaddr);
+ UPDATE_CIE_SRC(dev, address);
- dot11d_info->country_len = CoutryIeLen;
- memcpy(dot11d_info->country_buffer, pCoutryIe, CoutryIeLen);
+ dot11d_info->country_len = country_len;
+ memcpy(dot11d_info->country_buffer, country, country_len);
dot11d_info->state = DOT11D_STATE_LEARNED;
}
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index b0b5115bd4e2..cbf6337193d6 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -84,8 +84,8 @@ static inline void RESET_CIE_WATCHDOG(struct rtllib_device
*__pIeeeDev)
void dot11d_init(struct rtllib_device *dev);
void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee);
void dot11d_reset(struct rtllib_device *dev);
-void dot11d_update_country(struct rtllib_device *dev, u8 *pTaddr,
- u16 CoutryIeLen, u8 *pCoutryIe);
+void dot11d_update_country(struct rtllib_device *dev, u8 *address,
+ u16 country_len, u8 *country);
void dot11d_scan_complete(struct rtllib_device *dev);
#endif
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 8/8] staging: rtl8192e: rename macro arguments to avoid camel case - style
Rename following macro arguments to fix checkpatch warning: Avoid
Camelcase and make the arguments more readable, understandable.
__pIeeeDev -> __ieee_dev
__pTa -> __address
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.h | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index cbf6337193d6..0637de1cca47 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -58,28 +58,28 @@ static inline void copy_mac_addr(unsigned char *des,
unsigned char *src)
memcpy(des, src, 6);
}
-#define GET_DOT11D_INFO(__pIeeeDev)\
-((struct rt_dot11d_info *)((__pIeeeDev)->dot11d_info))
+#define GET_DOT11D_INFO(__ieee_dev)\
+((struct rt_dot11d_info *)((__ieee_dev)->dot11d_info))
-#define IS_DOT11D_ENABLE(__pIeeeDev) \
-(GET_DOT11D_INFO(__pIeeeDev)->enabled)
-#define IS_COUNTRY_IE_VALID(__pIeeeDev)\
- (GET_DOT11D_INFO(__pIeeeDev)->country_len > 0)
+#define IS_DOT11D_ENABLE(__ieee_dev) \
+(GET_DOT11D_INFO(__ieee_dev)->enabled)
+#define IS_COUNTRY_IE_VALID(__ieee_dev)\
+ (GET_DOT11D_INFO(__ieee_dev)->country_len > 0)
-#define IS_EQUAL_CIE_SRC(__pIeeeDev, __pTa)\
+#define IS_EQUAL_CIE_SRC(__ieee_dev, __address)\
ether_addr_equal_unaligned( \
- GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
-#define UPDATE_CIE_SRC(__pIeeeDev, __pTa) \
- copy_mac_addr(GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
+ GET_DOT11D_INFO(__ieee_dev)->country_src_addr, __address)
+#define UPDATE_CIE_SRC(__ieee_dev, __address) \
+ copy_mac_addr(GET_DOT11D_INFO(__ieee_dev)->country_src_addr, __address)
-#define GET_CIE_WATCHDOG(__pIeeeDev) \
-(GET_DOT11D_INFO(__pIeeeDev)->country_watchdog)
-static inline void RESET_CIE_WATCHDOG(struct rtllib_device *__pIeeeDev)
+#define GET_CIE_WATCHDOG(__ieee_dev) \
+(GET_DOT11D_INFO(__ieee_dev)->country_watchdog)
+static inline void RESET_CIE_WATCHDOG(struct rtllib_device *__ieee_dev)
{
- GET_CIE_WATCHDOG(__pIeeeDev) = 0;
+ GET_CIE_WATCHDOG(__ieee_dev) = 0;
}
-#define UPDATE_CIE_WATCHDOG(__pIeeeDev) (++GET_CIE_WATCHDOG(__pIeeeDev))
+#define UPDATE_CIE_WATCHDOG(__ieee_dev) (++GET_CIE_WATCHDOG(__ieee_dev))
void dot11d_init(struct rtllib_device *dev);
void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee);
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/8] staging: rtl8192e: rename function Dot11d_Reset to dot11d_reset - style
Rename function Dot11d_Reset to dot11d_reset to fix checkpatch warning:
Avoid CamelCase.
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.c | 4 ++--
drivers/staging/rtl8192e/dot11d.h | 2 +-
drivers/staging/rtl8192e/rtllib_softmac.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index 594476693159..90bc30a04a96 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -98,7 +98,7 @@ void dot11d_channel_map(u8 channel_plan, struct rtllib_device
*ieee)
}
EXPORT_SYMBOL(dot11d_channel_map);
-void Dot11d_Reset(struct rtllib_device *ieee)
+void dot11d_reset(struct rtllib_device *ieee)
{
struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(ieee);
u32 i;
@@ -167,7 +167,7 @@ void DOT11D_ScanComplete(struct rtllib_device *dev)
dot11d_info->state = DOT11D_STATE_DONE;
break;
case DOT11D_STATE_DONE:
- Dot11d_Reset(dev);
+ dot11d_reset(dev);
break;
case DOT11D_STATE_NONE:
break;
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index eb3a513d6826..42661dc913fc 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -83,7 +83,7 @@ static inline void RESET_CIE_WATCHDOG(struct rtllib_device
*__pIeeeDev)
void dot11d_init(struct rtllib_device *dev);
void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee);
-void Dot11d_Reset(struct rtllib_device *dev);
+void dot11d_reset(struct rtllib_device *dev);
void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,
u16 CoutryIeLen, u8 *pCoutryIe);
void DOT11D_ScanComplete(struct rtllib_device *dev);
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c
b/drivers/staging/rtl8192e/rtllib_softmac.c
index f1023e21fb5c..9752fda840d4 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -2759,7 +2759,7 @@ void rtllib_disassociate(struct rtllib_device *ieee)
if (ieee->data_hard_stop)
ieee->data_hard_stop(ieee->dev);
if (IS_DOT11D_ENABLE(ieee))
- Dot11d_Reset(ieee);
+ dot11d_reset(ieee);
ieee->state = RTLLIB_NOLINK;
ieee->is_set_key = false;
ieee->wap_set = 0;
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/8] staging: rtl8192e: rename function cpMacAddr to copy_mac_addr - style
Rename function cpMacAddr to copy_mac_addr in order to fix checkpatch
warning:Avoid CamelCase and make the function name more readable,
understandable.
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index 0394bb1c552e..afa95bf4e6ef 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -53,7 +53,7 @@ struct rt_dot11d_info {
enum dot11d_state state;
};
-static inline void cpMacAddr(unsigned char *des, unsigned char *src)
+static inline void copy_mac_addr(unsigned char *des, unsigned char *src)
{
memcpy(des, src, 6);
}
@@ -70,7 +70,7 @@ static inline void cpMacAddr(unsigned char *des, unsigned
char *src)
ether_addr_equal_unaligned( \
GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
#define UPDATE_CIE_SRC(__pIeeeDev, __pTa) \
- cpMacAddr(GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
+ copy_mac_addr(GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
#define GET_CIE_WATCHDOG(__pIeeeDev) \
(GET_DOT11D_INFO(__pIeeeDev)->country_watchdog)
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/8] staging: rtl8192e: rename function Dot11d_Channelmap to dot11d_channel_map - style
Rename function Dot11d_Channelmap to dot11d_channel_map to fix
checkpatch warning: Avoid CamelCase.
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.c| 4 ++--
drivers/staging/rtl8192e/dot11d.h| 2 +-
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index 6c26af3f377f..594476693159 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -56,7 +56,7 @@ void dot11d_init(struct rtllib_device *ieee)
}
EXPORT_SYMBOL(dot11d_init);
-void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device *ieee)
+void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee)
{
int i, max_chan = 14, min_chan = 1;
@@ -96,7 +96,7 @@ void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device
*ieee)
break;
}
}
-EXPORT_SYMBOL(Dot11d_Channelmap);
+EXPORT_SYMBOL(dot11d_channel_map);
void Dot11d_Reset(struct rtllib_device *ieee)
{
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index afa95bf4e6ef..eb3a513d6826 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -82,7 +82,7 @@ static inline void RESET_CIE_WATCHDOG(struct rtllib_device
*__pIeeeDev)
#define UPDATE_CIE_WATCHDOG(__pIeeeDev) (++GET_CIE_WATCHDOG(__pIeeeDev))
void dot11d_init(struct rtllib_device *dev);
-void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device *ieee);
+void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee);
void Dot11d_Reset(struct rtllib_device *dev);
void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,
u16 CoutryIeLen, u8 *pCoutryIe);
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 7031f6833b8b..c145b689175c 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1049,7 +1049,7 @@ static short _rtl92e_get_channel_map(struct net_device
*dev)
}
RT_TRACE(COMP_INIT, "Channel plan is %d\n", priv->ChannelPlan);
dot11d_init(priv->rtllib);
- Dot11d_Channelmap(priv->ChannelPlan, priv->rtllib);
+ dot11d_channel_map(priv->ChannelPlan, priv->rtllib);
for (i = 1; i <= 11; i++)
(priv->rtllib->active_channel_map)[i] = 1;
(priv->rtllib->active_channel_map)[12] = 2;
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 6/8] staging: rtl8192e: rename local variables of function dot11d_update_country - style
Rename following local variables of function dot11d_update_country to
fix checkpatch warning: Avoid CamelCase and make the variable names more
readable, understandable.
NumTriples -> number_of_triples
MaxChnlNum -> max_channel_number
pTriple -> triple
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.c | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index 3e66e01138db..fdf6d951384c 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -118,37 +118,37 @@ void dot11d_update_country(struct rtllib_device *dev, u8
*pTaddr,
u16 CoutryIeLen, u8 *pCoutryIe)
{
struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(dev);
- u8 i, j, NumTriples, MaxChnlNum;
- struct chnl_txpow_triple *pTriple;
+ u8 i, j, number_of_triples, max_channel_number;
+ struct chnl_txpow_triple *triple;
memset(dot11d_info->channel_map, 0, MAX_CHANNEL_NUMBER + 1);
memset(dot11d_info->max_tx_power_list, 0xFF, MAX_CHANNEL_NUMBER + 1);
- MaxChnlNum = 0;
- NumTriples = (CoutryIeLen - 3) / 3;
- pTriple = (struct chnl_txpow_triple *)(pCoutryIe + 3);
- for (i = 0; i < NumTriples; i++) {
- if (MaxChnlNum >= pTriple->first_channel) {
+ max_channel_number = 0;
+ number_of_triples = (CoutryIeLen - 3) / 3;
+ triple = (struct chnl_txpow_triple *)(pCoutryIe + 3);
+ for (i = 0; i < number_of_triples; i++) {
+ if (max_channel_number >= triple->first_channel) {
netdev_info(dev->dev,
"%s: Invalid country IE, skip it..1\n",
__func__);
return;
}
- if (MAX_CHANNEL_NUMBER < (pTriple->first_channel +
- pTriple->num_channels)) {
+ if (MAX_CHANNEL_NUMBER < (triple->first_channel +
+ triple->num_channels)) {
netdev_info(dev->dev,
"%s: Invalid country IE, skip it..2\n",
__func__);
return;
}
- for (j = 0; j < pTriple->num_channels; j++) {
- dot11d_info->channel_map[pTriple->first_channel + j] =
1;
- dot11d_info->max_tx_power_list[pTriple->first_channel +
j] =
-pTriple->max_tx_power;
- MaxChnlNum = pTriple->first_channel + j;
+ for (j = 0; j < triple->num_channels; j++) {
+ dot11d_info->channel_map[triple->first_channel + j] = 1;
+ dot11d_info->max_tx_power_list[triple->first_channel +
j] =
+triple->max_tx_power;
+ max_channel_number = triple->first_channel + j;
}
- pTriple = (struct chnl_txpow_triple *)((u8 *)pTriple + 3);
+ triple = (struct chnl_txpow_triple *)((u8 *)triple + 3);
}
UPDATE_CIE_SRC(dev, pTaddr);
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 4/8] staging: rtl8192e: rename function Dot11d_UpdateCountryIe to dot11d_update_country - style
Rename function Dot11d_UpdateCountryIe to dot11d_update_country to fix
checkpatch warning: Avoid CamelCase.
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.c| 2 +-
drivers/staging/rtl8192e/dot11d.h| 2 +-
drivers/staging/rtl8192e/rtllib_rx.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.c
b/drivers/staging/rtl8192e/dot11d.c
index 90bc30a04a96..5e5d1b4bf33f 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -114,7 +114,7 @@ void dot11d_reset(struct rtllib_device *ieee)
RESET_CIE_WATCHDOG(ieee);
}
-void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,
+void dot11d_update_country(struct rtllib_device *dev, u8 *pTaddr,
u16 CoutryIeLen, u8 *pCoutryIe)
{
struct rt_dot11d_info *dot11d_info = GET_DOT11D_INFO(dev);
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index 42661dc913fc..9f0c2634520b 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -84,7 +84,7 @@ static inline void RESET_CIE_WATCHDOG(struct rtllib_device
*__pIeeeDev)
void dot11d_init(struct rtllib_device *dev);
void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee);
void dot11d_reset(struct rtllib_device *dev);
-void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,
+void dot11d_update_country(struct rtllib_device *dev, u8 *pTaddr,
u16 CoutryIeLen, u8 *pCoutryIe);
void DOT11D_ScanComplete(struct rtllib_device *dev);
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c
b/drivers/staging/rtl8192e/rtllib_rx.c
index 501ded929329..debc2e40af00 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -1812,7 +1812,7 @@ static inline void rtllib_extract_country_ie(
netdev_info(ieee->dev,
"Received beacon ContryIE,
SSID: <%s>\n",
network->ssid);
- Dot11d_UpdateCountryIe(ieee, addr2,
+ dot11d_update_country(ieee, addr2,
info_element->len,
info_element->data);
}
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: rtl8192e: rename function cpMacAddr to copy_mac_addr - style
Rename function cpMacAddr to copy_mac_addr in order to fix checkpatch
warning: Avoid CamelCase and make the function name more readable,
understandable.
---
Changes in V2:
Properly wrap commit message at 72 columns.
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index 548b7206c0db..cbf6337193d6 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -53,7 +53,7 @@ struct rt_dot11d_info {
enum dot11d_state state;
};
-static inline void cpMacAddr(unsigned char *des, unsigned char *src)
+static inline void copy_mac_addr(unsigned char *des, unsigned char *src)
{
memcpy(des, src, 6);
}
@@ -70,7 +70,7 @@ static inline void cpMacAddr(unsigned char *des, unsigned
char *src)
ether_addr_equal_unaligned( \
GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
#define UPDATE_CIE_SRC(__pIeeeDev, __pTa) \
- cpMacAddr(GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
+ copy_mac_addr(GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
#define GET_CIE_WATCHDOG(__pIeeeDev) \
(GET_DOT11D_INFO(__pIeeeDev)->country_watchdog)
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 8/8] staging: rtl8192e: rename macro arguments to avoid camel case - style
I guess this patch has not been reviewed yet. Please let me know if it
needs revision.
Thank you.
- Himadri
On 10/02/19 2:13 PM, Himadri Pandya wrote:
Rename following macro arguments to fix checkpatch warning: Avoid
Camelcase and make the arguments more readable, understandable.
__pIeeeDev -> __ieee_dev
__pTa -> __address
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.h | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index cbf6337193d6..0637de1cca47 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -58,28 +58,28 @@ static inline void copy_mac_addr(unsigned char *des,
unsigned char *src)
memcpy(des, src, 6);
}
-#define GET_DOT11D_INFO(__pIeeeDev) \
-((struct rt_dot11d_info *)((__pIeeeDev)->dot11d_info))
+#define GET_DOT11D_INFO(__ieee_dev)\
+((struct rt_dot11d_info *)((__ieee_dev)->dot11d_info))
-#define IS_DOT11D_ENABLE(__pIeeeDev) \
-(GET_DOT11D_INFO(__pIeeeDev)->enabled)
-#define IS_COUNTRY_IE_VALID(__pIeeeDev)\
- (GET_DOT11D_INFO(__pIeeeDev)->country_len > 0)
+#define IS_DOT11D_ENABLE(__ieee_dev) \
+(GET_DOT11D_INFO(__ieee_dev)->enabled)
+#define IS_COUNTRY_IE_VALID(__ieee_dev)\
+ (GET_DOT11D_INFO(__ieee_dev)->country_len > 0)
-#define IS_EQUAL_CIE_SRC(__pIeeeDev, __pTa) \
+#define IS_EQUAL_CIE_SRC(__ieee_dev, __address)\
ether_addr_equal_unaligned( \
- GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
-#define UPDATE_CIE_SRC(__pIeeeDev, __pTa) \
- copy_mac_addr(GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
+ GET_DOT11D_INFO(__ieee_dev)->country_src_addr, __address)
+#define UPDATE_CIE_SRC(__ieee_dev, __address) \
+ copy_mac_addr(GET_DOT11D_INFO(__ieee_dev)->country_src_addr, __address)
-#define GET_CIE_WATCHDOG(__pIeeeDev)\
-(GET_DOT11D_INFO(__pIeeeDev)->country_watchdog)
-static inline void RESET_CIE_WATCHDOG(struct rtllib_device *__pIeeeDev)
+#define GET_CIE_WATCHDOG(__ieee_dev) \
+(GET_DOT11D_INFO(__ieee_dev)->country_watchdog)
+static inline void RESET_CIE_WATCHDOG(struct rtllib_device *__ieee_dev)
{
- GET_CIE_WATCHDOG(__pIeeeDev) = 0;
+ GET_CIE_WATCHDOG(__ieee_dev) = 0;
}
-#define UPDATE_CIE_WATCHDOG(__pIeeeDev) (++GET_CIE_WATCHDOG(__pIeeeDev))
+#define UPDATE_CIE_WATCHDOG(__ieee_dev) (++GET_CIE_WATCHDOG(__ieee_dev))
void dot11d_init(struct rtllib_device *dev);
void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee);
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2] staging: rtl8192e: rename function cpMacAddr to copy_mac_addr - style
On 13/02/19 1:25 AM, Dan Carpenter wrote: On Wed, Feb 13, 2019 at 01:14:38AM +0530, Himadri Pandya wrote: Rename function cpMacAddr to copy_mac_addr in order to fix checkpatch warning: Avoid CamelCase and make the function name more readable, understandable. --- Changes in V2: Properly wrap commit message at 72 columns. Signed-off-by: Himadri Pandya --- drivers/staging/rtl8192e/dot11d.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) When you apply this patch with `cat email.txt | git am` then it's going to remove everything below the first --- line so it will remove your Signed-off-by line. Thank you for pointing that out. Re-sending it with 'Signed-off-by' before '---'. - Himadri ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: rtl8192e: rename function cpMacAddr to copy_mac_addr - style
Rename function cpMacAddr to copy_mac_addr in order to fix checkpatch
warning: Avoid CamelCase and make the function name more readable,
understandable.
Signed-off-by: Himadri Pandya
---
Changes in V2:
Properly wrap commit message at 72 columns.
---
drivers/staging/rtl8192e/dot11d.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index 548b7206c0db..cbf6337193d6 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -53,7 +53,7 @@ struct rt_dot11d_info {
enum dot11d_state state;
};
-static inline void cpMacAddr(unsigned char *des, unsigned char *src)
+static inline void copy_mac_addr(unsigned char *des, unsigned char *src)
{
memcpy(des, src, 6);
}
@@ -70,7 +70,7 @@ static inline void cpMacAddr(unsigned char *des, unsigned
char *src)
ether_addr_equal_unaligned( \
GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
#define UPDATE_CIE_SRC(__pIeeeDev, __pTa) \
- cpMacAddr(GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
+ copy_mac_addr(GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
#define GET_CIE_WATCHDOG(__pIeeeDev) \
(GET_DOT11D_INFO(__pIeeeDev)->country_watchdog)
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 8/8] staging: rtl8192e: rename macro arguments to avoid camel case - style
On 13/02/19 2:36 PM, Greg KH wrote: A: http://en.wikipedia.org/wiki/Top_post Q: Were do I find info about this thing called top-posting? A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing in e-mail? A: No. Q: Should I include quotations after my reply? http://daringfireball.net/2007/07/on_top Apologies for top-posting and thank you for the references to understand why it should be avoided. - Himadri ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8192e: rename macro arguments to avoid camel case - style
Rename following macro arguments to fix checkpatch warning: Avoid
CamelCase and make the arguments more readable, understandable.
__pIeeeDev -> __ieee_dev
__pTa -> __address
Signed-off-by: Himadri Pandya
---
drivers/staging/rtl8192e/dot11d.h | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/rtl8192e/dot11d.h
b/drivers/staging/rtl8192e/dot11d.h
index cbf6337193d6..0637de1cca47 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -58,28 +58,28 @@ static inline void copy_mac_addr(unsigned char *des,
unsigned char *src)
memcpy(des, src, 6);
}
-#define GET_DOT11D_INFO(__pIeeeDev)\
-((struct rt_dot11d_info *)((__pIeeeDev)->dot11d_info))
+#define GET_DOT11D_INFO(__ieee_dev)\
+((struct rt_dot11d_info *)((__ieee_dev)->dot11d_info))
-#define IS_DOT11D_ENABLE(__pIeeeDev) \
-(GET_DOT11D_INFO(__pIeeeDev)->enabled)
-#define IS_COUNTRY_IE_VALID(__pIeeeDev)\
- (GET_DOT11D_INFO(__pIeeeDev)->country_len > 0)
+#define IS_DOT11D_ENABLE(__ieee_dev) \
+(GET_DOT11D_INFO(__ieee_dev)->enabled)
+#define IS_COUNTRY_IE_VALID(__ieee_dev)\
+ (GET_DOT11D_INFO(__ieee_dev)->country_len > 0)
-#define IS_EQUAL_CIE_SRC(__pIeeeDev, __pTa)\
+#define IS_EQUAL_CIE_SRC(__ieee_dev, __address)\
ether_addr_equal_unaligned( \
- GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
-#define UPDATE_CIE_SRC(__pIeeeDev, __pTa) \
- copy_mac_addr(GET_DOT11D_INFO(__pIeeeDev)->country_src_addr, __pTa)
+ GET_DOT11D_INFO(__ieee_dev)->country_src_addr, __address)
+#define UPDATE_CIE_SRC(__ieee_dev, __address) \
+ copy_mac_addr(GET_DOT11D_INFO(__ieee_dev)->country_src_addr, __address)
-#define GET_CIE_WATCHDOG(__pIeeeDev) \
-(GET_DOT11D_INFO(__pIeeeDev)->country_watchdog)
-static inline void RESET_CIE_WATCHDOG(struct rtllib_device *__pIeeeDev)
+#define GET_CIE_WATCHDOG(__ieee_dev) \
+(GET_DOT11D_INFO(__ieee_dev)->country_watchdog)
+static inline void RESET_CIE_WATCHDOG(struct rtllib_device *__ieee_dev)
{
- GET_CIE_WATCHDOG(__pIeeeDev) = 0;
+ GET_CIE_WATCHDOG(__ieee_dev) = 0;
}
-#define UPDATE_CIE_WATCHDOG(__pIeeeDev) (++GET_CIE_WATCHDOG(__pIeeeDev))
+#define UPDATE_CIE_WATCHDOG(__ieee_dev) (++GET_CIE_WATCHDOG(__ieee_dev))
void dot11d_init(struct rtllib_device *dev);
void dot11d_channel_map(u8 channel_plan, struct rtllib_device *ieee);
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] net: dsa: add missing of_node_put
Decrement the reference count on port while returning out of the loop.
Signed-off-by: Himadri Pandya
---
net/dsa/dsa2.c | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index a1917025e155..396e7433dd8f 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -624,19 +624,25 @@ static int dsa_switch_parse_ports_of(struct dsa_switch
*ds,
for_each_available_child_of_node(ports, port) {
err = of_property_read_u32(port, "reg", ®);
if (err)
- return err;
+ goto put_port;
- if (reg >= ds->num_ports)
- return -EINVAL;
+ if (reg >= ds->num_ports) {
+ err = -EINVAL;
+ goto put_port;
+ }
dp = &ds->ports[reg];
err = dsa_port_parse_of(dp, port);
if (err)
- return err;
+ goto put_port;
}
return 0;
+
+put_port:
+ of_node_put(port);
+ return err;
}
static int dsa_switch_parse_member_of(struct dsa_switch *ds,
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: fbtft: fix alignment should match open parenthesis
Fix checkpatch warning "Alignment should match open parenthesis". Signed-off-by: Himadri Pandya --- drivers/staging/fbtft/fb_tinylcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/fbtft/fb_tinylcd.c b/drivers/staging/fbtft/fb_tinylcd.c index 9469248f2c50..60cda57bcb33 100644 --- a/drivers/staging/fbtft/fb_tinylcd.c +++ b/drivers/staging/fbtft/fb_tinylcd.c @@ -38,7 +38,7 @@ static int init_display(struct fbtft_par *par) write_reg(par, 0xE5, 0x00); write_reg(par, 0xF0, 0x36, 0xA5, 0x53); write_reg(par, 0xE0, 0x00, 0x35, 0x33, 0x00, 0x00, 0x00, - 0x00, 0x35, 0x33, 0x00, 0x00, 0x00); + 0x00, 0x35, 0x33, 0x00, 0x00, 0x00); write_reg(par, MIPI_DCS_SET_PIXEL_FORMAT, 0x55); write_reg(par, MIPI_DCS_EXIT_SLEEP_MODE); udelay(250); -- 2.17.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: gasket: replace symbolic permissions with octal permissions
Resolve checkpatch warning for using symbolic permissions by replacing
them with octal permissions.
Signed-off-by: Himadri Pandya
---
drivers/staging/gasket/gasket_sysfs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/gasket/gasket_sysfs.h
b/drivers/staging/gasket/gasket_sysfs.h
index 1d0eed66a7f4..28dc422d388c 100644
--- a/drivers/staging/gasket/gasket_sysfs.h
+++ b/drivers/staging/gasket/gasket_sysfs.h
@@ -75,7 +75,7 @@ struct gasket_sysfs_attribute {
#define GASKET_SYSFS_RO(_name, _show_function, _attr_type)
\
{ \
- .attr = __ATTR(_name, S_IRUGO, _show_function, NULL), \
+ .attr = __ATTR(_name, 0444, _show_function, NULL), \
.data.attr_type = _attr_type \
}
--
2.17.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: fbtft: fix alignment should match open parenthesis
On 10/04/19 4:12 PM, Dan Carpenter wrote: On Wed, Apr 10, 2019 at 03:30:22PM +0530, Himadri Pandya wrote: Fix checkpatch warning "Alignment should match open parenthesis". Signed-off-by: Himadri Pandya --- drivers/staging/fbtft/fb_tinylcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/fbtft/fb_tinylcd.c b/drivers/staging/fbtft/fb_tinylcd.c index 9469248f2c50..60cda57bcb33 100644 --- a/drivers/staging/fbtft/fb_tinylcd.c +++ b/drivers/staging/fbtft/fb_tinylcd.c @@ -38,7 +38,7 @@ static int init_display(struct fbtft_par *par) write_reg(par, 0xE5, 0x00); write_reg(par, 0xF0, 0x36, 0xA5, 0x53); write_reg(par, 0xE0, 0x00, 0x35, 0x33, 0x00, 0x00, 0x00, - 0x00, 0x35, 0x33, 0x00, 0x00, 0x00); + 0x00, 0x35, 0x33, 0x00, 0x00, 0x00); The original code was written that way deliberately. I don't know why it's broken up like that but it probably means something to people who have read the hardware spec. I would leave it as-is. regards, dan carpenter Okay. Thank you for reviewing it. - Himadri ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: wlan-ng: Fix improper SPDX comment style
The SPDX license identifier should have the form // SPDX-License-Identifier: for a .c source file. File hfa384x_usb.c has instead the form /* SPDX-License-Identifier: */ which is the form for C header files. Hence this patch corrects it. Issue identified by checkpatch. Signed-off-by: Himadri Pandya --- drivers/staging/wlan-ng/hfa384x_usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c index 81a6b0324641..6fde75d4f064 100644 --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/drivers/staging/wlan-ng/hfa384x_usb.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) */ +// SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1) /* src/prism2/driver/hfa384x_usb.c * * Functions that talk to the USB variant of the Intersil hfa384x MAC -- 2.17.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
