staging: r8188eu: trivial code cleanup patches
v3 cover staging: r8188eu: trivial code cleanup patches
Address different kinds of checkpatch complains for the staging/r8188eu module. The patches are required to be applied in sequence.
Changes in v3:
1. Patch 4: Extend the __constant_htons to htons change to other files of the driver. This was suggested by [email protected]
2. Patch 4: Spelling mistake corrected as pointed out by [email protected]
3. Patch 5 through 10: Included in this version. Additional clean up patches.
Changes in v2:
I incorrectly labeled the first revision as v1 instead of v2. So, following change recorded under v1 is actually changes for v2. Feedback provided by [email protected]
1. Improve language / grammar for the patch descriptions
2. Further improve code reformatting
Deepak R Varma (10):
staging: r8188eu: use Linux kernel variable naming convention
staging: r8188eu: reformat long computation lines
staging: r8188eu: remove {} for single statement blocks
staging: r8188eu: use htons macro instead of __constant_htons
staging: r8188eu: correct misspelled words in comments
staging: r8188eu: Add space between function & macro parameters
staging: r8188eu: Associate pointer symbol with parameter name
staging: r8188eu: replace leading spaces by tabs
staging: r8188eu: Put '{" on the symbol declaration line
staging: r8188eu: Correct missing or extra space in the statements
drivers/staging/r8188eu/core/rtw_br_ext.c | 122 +++++++++--------- drivers/staging/r8188eu/core/rtw_ioctl_set.c | 2 +- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 36 +++--- drivers/staging/r8188eu/core/rtw_recv.c | 8 +- drivers/staging/r8188eu/core/rtw_xmit.c | 14 +- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 2 +- drivers/staging/r8188eu/hal/odm_RTL8188E.c | 2 +- .../staging/r8188eu/hal/rtl8188e_hal_init.c | 2 +- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 4 +- .../staging/r8188eu/include/Hal8188EPhyReg.h | 4 +- .../staging/r8188eu/include/osdep_service.h | 4 +- .../staging/r8188eu/include/rtl8188e_hal.h | 6 +- .../staging/r8188eu/include/rtl8188e_spec.h | 18 +-- drivers/staging/r8188eu/include/rtw_cmd.h | 52 ++++---- drivers/staging/r8188eu/include/rtw_io.h | 28 ++-- .../staging/r8188eu/include/rtw_ioctl_set.h | 4 +- drivers/staging/r8188eu/include/rtw_mlme.h | 22 ++-- .../staging/r8188eu/include/rtw_mlme_ext.h | 12 +- drivers/staging/r8188eu/include/rtw_recv.h | 4 +- drivers/staging/r8188eu/include/rtw_xmit.h | 2 +- drivers/staging/r8188eu/include/wifi.h | 12 +- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 6 +- 22 files changed, 181 insertions(+), 185 deletions(-)
--
2.30.2
PATCH v3 1/10 staging: r8188eu: use Linux kernel variable naming convention
Follow the Linux Kernel coding style variable naming convention instead of using camelCase style. Issue reported by checkpatch script for these variables:
tagLen, tagType, networkAddr, ipAddr, macAddr
Signed-off-by Deepak R Varma <[email protected]>
---
Changes in v3:
-- None
Changes in v1 [actually v2]:
1. Improve patch description per feedback from [email protected]
drivers/staging/r8188eu/core/rtw_br_ext.c | 112 +++++++++++----------- 1 file changed, 56 insertions(+), 56 deletions(-)
drivers/staging/r8188eu/core/rtw_br_ext.c +56 -56
@@ -50,17 +50,17 @@static unsigned char *__nat25_find_pppoe_tag (struct pppoe_hdr *ph,unsigned short type) {unsigned char *cur_ptr, *start_ptr; -unsigned short tagLen, tagType; +unsigned short tag_len, tag_type; start_ptr = (unsigned char *)ph->tag; cur_ptr = (unsigned char *)ph->tag;while ((cur_ptr - start_ptr) <ntohs (ph->length)) {/* prevent un-alignment access */ - tagType = (unsigned short )((cur_ptr[0 ] <<8 ) + cur_ptr[1 ]); - tagLen = (unsigned short )((cur_ptr[2 ] <<8 ) + cur_ptr[3 ]); -if (tagType == type) + tag_type = (unsigned short )((cur_ptr[0 ] <<8 ) + cur_ptr[1 ]); + tag_len = (unsigned short )((cur_ptr[2 ] <<8 ) + cur_ptr[3 ]); +if (tag_type == type)return cur_ptr; - cur_ptr = cur_ptr +TAG_HDR_LEN + tagLen; + cur_ptr = cur_ptr +TAG_HDR_LEN + tag_len; }return NULL ; }
@@ -111,32 +111,32 @@ static int __nat25_has_expired(struct nat25_network_db_entry *fdb)return 0 ; } -static void __nat25_generate_ipv4_network_addr (unsigned char *networkAddr, -unsigned int *ipAddr) +static void __nat25_generate_ipv4_network_addr (unsigned char *network_addr, +unsigned int *ip_addr) { -memset (networkAddr,0 ,MAX_NETWORK_ADDR_LEN ); +memset (network_addr,0 ,MAX_NETWORK_ADDR_LEN ); - networkAddr[0 ] =NAT25_IPV4 ; -memcpy (networkAddr +7 , (unsigned char *)ipAddr,4 ); + network_addr[0 ] =NAT25_IPV4 ; +memcpy (network_addr +7 , (unsigned char *)ip_addr,4 ); } -static void __nat25_generate_pppoe_network_addr (unsigned char *networkAddr, +static void __nat25_generate_pppoe_network_addr (unsigned char *network_addr,unsigned char *ac_mac,__be16 *sid) { -memset (networkAddr,0 ,MAX_NETWORK_ADDR_LEN ); +memset (network_addr,0 ,MAX_NETWORK_ADDR_LEN ); - networkAddr[0 ] =NAT25_PPPOE ; -memcpy (networkAddr +1 , (unsigned char *)sid,2 ); -memcpy (networkAddr +3 , (unsigned char *)ac_mac,6 ); + network_addr[0 ] =NAT25_PPPOE ; +memcpy (network_addr +1 , (unsigned char *)sid,2 ); +memcpy (network_addr +3 , (unsigned char *)ac_mac,6 ); } -static void __nat25_generate_ipv6_network_addr (unsigned char *networkAddr, -unsigned int *ipAddr) +static void __nat25_generate_ipv6_network_addr (unsigned char *network_addr, +unsigned int *ip_addr) { -memset (networkAddr,0 ,MAX_NETWORK_ADDR_LEN ); +memset (network_addr,0 ,MAX_NETWORK_ADDR_LEN ); - networkAddr[0 ] =NAT25_IPV6 ; -memcpy (networkAddr +1 , (unsigned char *)ipAddr,16 ); + network_addr[0 ] =NAT25_IPV6 ; +memcpy (network_addr +1 , (unsigned char *)ip_addr,16 ); }static unsigned char *scan_tlv (unsigned char *data,int len,unsigned char tag,unsigned char len8b)
@@ -200,40 +200,40 @@ static int update_nd_link_layer_addr(unsigned char *data, int len, unsigned charreturn 0 ; } -static int __nat25_network_hash (unsigned char *networkAddr) +static int __nat25_network_hash (unsigned char *network_addr) { -if (networkAddr[0 ] ==NAT25_IPV4 ) { +if (network_addr[0 ] ==NAT25_IPV4 ) {unsigned long x; - x = networkAddr[7 ] ^ networkAddr[8 ] ^ networkAddr[9 ] ^ networkAddr[10 ]; + x = network_addr[7 ] ^ network_addr[8 ] ^ network_addr[9 ] ^ network_addr[10 ];return x & (NAT25_HASH_SIZE -1 ); - }else if (networkAddr[0 ] ==NAT25_IPX ) { + }else if (network_addr[0 ] ==NAT25_IPX ) {unsigned long x; - x = networkAddr[1 ] ^ networkAddr[2 ] ^ networkAddr[3 ] ^ networkAddr[4 ] ^ networkAddr[5 ] ^ - networkAddr[6 ] ^ networkAddr[7 ] ^ networkAddr[8 ] ^ networkAddr[9 ] ^ networkAddr[10 ]; + x = network_addr[1 ] ^ network_addr[2 ] ^ network_addr[3 ] ^ network_addr[4 ] ^ network_addr[5 ] ^ + network_addr[6 ] ^ network_addr[7 ] ^ network_addr[8 ] ^ network_addr[9 ] ^ network_addr[10 ];return x & (NAT25_HASH_SIZE -1 ); - }else if (networkAddr[0 ] ==NAT25_APPLE ) { + }else if (network_addr[0 ] ==NAT25_APPLE ) {unsigned long x; - x = networkAddr[1 ] ^ networkAddr[2 ] ^ networkAddr[3 ]; + x = network_addr[1 ] ^ network_addr[2 ] ^ network_addr[3 ];return x & (NAT25_HASH_SIZE -1 ); - }else if (networkAddr[0 ] ==NAT25_PPPOE ) { + }else if (network_addr[0 ] ==NAT25_PPPOE ) {unsigned long x; - x = networkAddr[0 ] ^ networkAddr[1 ] ^ networkAddr[2 ] ^ networkAddr[3 ] ^ networkAddr[4 ] ^ networkAddr[5 ] ^ networkAddr[6 ] ^ networkAddr[7 ] ^ networkAddr[8 ]; + x = network_addr[0 ] ^ network_addr[1 ] ^ network_addr[2 ] ^ network_addr[3 ] ^ network_addr[4 ] ^ network_addr[5 ] ^ network_addr[6 ] ^ network_addr[7 ] ^ network_addr[8 ];return x & (NAT25_HASH_SIZE -1 ); - }else if (networkAddr[0 ] ==NAT25_IPV6 ) { + }else if (network_addr[0 ] ==NAT25_IPV6 ) {unsigned long x; - x = networkAddr[1 ] ^ networkAddr[2 ] ^ networkAddr[3 ] ^ networkAddr[4 ] ^ networkAddr[5 ] ^ - networkAddr[6 ] ^ networkAddr[7 ] ^ networkAddr[8 ] ^ networkAddr[9 ] ^ networkAddr[10 ] ^ - networkAddr[11 ] ^ networkAddr[12 ] ^ networkAddr[13 ] ^ networkAddr[14 ] ^ networkAddr[15 ] ^ - networkAddr[16 ]; + x = network_addr[1 ] ^ network_addr[2 ] ^ network_addr[3 ] ^ network_addr[4 ] ^ network_addr[5 ] ^ + network_addr[6 ] ^ network_addr[7 ] ^ network_addr[8 ] ^ network_addr[9 ] ^ network_addr[10 ] ^ + network_addr[11 ] ^ network_addr[12 ] ^ network_addr[13 ] ^ network_addr[14 ] ^ network_addr[15 ] ^ + network_addr[16 ];return x & (NAT25_HASH_SIZE -1 ); }else {
@@ -241,7 +241,7 @@ static int __nat25_network_hash(unsigned char *networkAddr)int i;for (i =0 ; i <MAX_NETWORK_ADDR_LEN ; i++) - x ^= networkAddr[i]; + x ^= network_addr[i];return x & (NAT25_HASH_SIZE -1 ); }
@@ -269,17 +269,17 @@ static void __network_hash_unlink(struct nat25_network_db_entry *ent) }static void __nat25_db_network_insert (struct adapter *priv, -unsigned char *macAddr,unsigned char *networkAddr) +unsigned char *mac_addr,unsigned char *network_addr) {struct nat25_network_db_entry *db;int hash;spin_lock_bh (&priv->br_ext_lock); - hash =__nat25_network_hash (networkAddr); + hash =__nat25_network_hash (network_addr); db = priv->nethash[hash];while (db) { -if (!memcmp (db->networkAddr, networkAddr,MAX_NETWORK_ADDR_LEN )) { -memcpy (db->macAddr, macAddr,ETH_ALEN ); +if (!memcmp (db->networkAddr, network_addr,MAX_NETWORK_ADDR_LEN )) { +memcpy (db->macAddr, mac_addr,ETH_ALEN ); db->ageing_timer = jiffies;spin_unlock_bh (&priv->br_ext_lock);return ;
@@ -291,8 +291,8 @@ static void __nat25_db_network_insert(struct adapter *priv,spin_unlock_bh (&priv->br_ext_lock);return ; } -memcpy (db->networkAddr, networkAddr,MAX_NETWORK_ADDR_LEN ); -memcpy (db->macAddr, macAddr,ETH_ALEN ); +memcpy (db->networkAddr, network_addr,MAX_NETWORK_ADDR_LEN ); +memcpy (db->macAddr, mac_addr,ETH_ALEN );atomic_set (&db->use_count,1 ); db->ageing_timer = jiffies;
@@ -366,7 +366,7 @@ void nat25_db_expire(struct adapter *priv)int nat25_db_handle (struct adapter *priv,struct sk_buff *skb,int method) {unsigned short protocol; -unsigned char networkAddr[MAX_NETWORK_ADDR_LEN ]; +unsigned char network_addr[MAX_NETWORK_ADDR_LEN ];unsigned int tmp;if (!skb)
@@ -395,9 +395,9 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)if (iph->saddr ==0 )return 0 ; tmp =be32_to_cpu (iph->saddr); -__nat25_generate_ipv4_network_addr (networkAddr, &tmp); +__nat25_generate_ipv4_network_addr (network_addr, &tmp);/* record source IP address and , source mac address into db */ -__nat25_db_network_insert (priv, skb->data +ETH_ALEN , networkAddr); +__nat25_db_network_insert (priv, skb->data +ETH_ALEN , network_addr);return 0 ;default :return -1 ;
@@ -421,8 +421,8 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)memcpy (arp_ptr,GET_MY_HWADDR (priv),ETH_ALEN ); arp_ptr += arp->ar_hln; sender = (unsigned int *)arp_ptr; -__nat25_generate_ipv4_network_addr (networkAddr, sender); -__nat25_db_network_insert (priv, skb->data +ETH_ALEN , networkAddr); +__nat25_generate_ipv4_network_addr (network_addr, sender); +__nat25_db_network_insert (priv, skb->data +ETH_ALEN , network_addr);return 0 ;default :return -1 ;
@@ -495,9 +495,9 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)return -1 ; } }else {/* session phase */ -__nat25_generate_pppoe_network_addr (networkAddr, skb->data, &ph->sid); +__nat25_generate_pppoe_network_addr (network_addr, skb->data, &ph->sid); -__nat25_db_network_insert (priv, skb->data +ETH_ALEN , networkAddr); +__nat25_db_network_insert (priv, skb->data +ETH_ALEN , network_addr); if (!priv->ethBrExtInfo.addPPPoETag && priv->pppoe_connection_in_progress &&
@@ -548,8 +548,8 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)return -1 ;case NAT25_INSERT :if (memcmp (&iph->saddr,"\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0" ,16 )) { -__nat25_generate_ipv6_network_addr (networkAddr, (unsigned int *)&iph->saddr); -__nat25_db_network_insert (priv, skb->data +ETH_ALEN , networkAddr); +__nat25_generate_ipv6_network_addr (network_addr, (unsigned int *)&iph->saddr); +__nat25_db_network_insert (priv, skb->data +ETH_ALEN , network_addr);if (iph->nexthdr ==IPPROTO_ICMPV6 && skb->len > (ETH_HLEN +sizeof (*iph) +4 )) {
@@ -639,17 +639,17 @@ void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb) } } -void *scdb_findEntry (struct adapter *priv,unsigned char *ipAddr) +void *scdb_findEntry (struct adapter *priv,unsigned char *ip_addr) { -unsigned char networkAddr[MAX_NETWORK_ADDR_LEN ]; +unsigned char network_addr[MAX_NETWORK_ADDR_LEN ];struct nat25_network_db_entry *db;int hash; -__nat25_generate_ipv4_network_addr (networkAddr, (unsigned int *)ipAddr); - hash =__nat25_network_hash (networkAddr); +__nat25_generate_ipv4_network_addr (network_addr, (unsigned int *)ip_addr); + hash =__nat25_network_hash (network_addr); db = priv->nethash[hash];while (db) { -if (!memcmp (db->networkAddr, networkAddr,MAX_NETWORK_ADDR_LEN )) { +if (!memcmp (db->networkAddr, network_addr,MAX_NETWORK_ADDR_LEN )) {return (void *)db; }
--
2.30.2
PATCH v3 2/10 staging: r8188eu: reformat long computation lines
In reply to Deepak R VarmaReformat long running computation instructions to improve code readability. Address checkpatch script complaints like:
CHECK: line length of 171 exceeds 100 columns
Signed-off-by Deepak R Varma <[email protected]>
---
Changes in v3:
-- None
Changes in v1 [actually v2]:
1. Further improve the formatting per feedback from [email protected]
drivers/staging/r8188eu/core/rtw_br_ext.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/staging/r8188eu/core/rtw_br_ext.c +10 -7
@@ -211,8 +211,9 @@ static int __nat25_network_hash(unsigned char *network_addr) }else if (network_addr[0 ] ==NAT25_IPX ) {unsigned long x; - x = network_addr[1 ] ^ network_addr[2 ] ^ network_addr[3 ] ^ network_addr[4 ] ^ network_addr[5 ] ^ - network_addr[6 ] ^ network_addr[7 ] ^ network_addr[8 ] ^ network_addr[9 ] ^ network_addr[10 ]; + x = network_addr[1 ] ^ network_addr[2 ] ^ network_addr[3 ] ^ network_addr[4 ] ^ + network_addr[5 ] ^ network_addr[6 ] ^ network_addr[7 ] ^ network_addr[8 ] ^ + network_addr[9 ] ^ network_addr[10 ];return x & (NAT25_HASH_SIZE -1 ); }else if (network_addr[0 ] ==NAT25_APPLE ) {
@@ -224,16 +225,18 @@ static int __nat25_network_hash(unsigned char *network_addr) }else if (network_addr[0 ] ==NAT25_PPPOE ) {unsigned long x; - x = network_addr[0 ] ^ network_addr[1 ] ^ network_addr[2 ] ^ network_addr[3 ] ^ network_addr[4 ] ^ network_addr[5 ] ^ network_addr[6 ] ^ network_addr[7 ] ^ network_addr[8 ]; + x = network_addr[0 ] ^ network_addr[1 ] ^ network_addr[2 ] ^ network_addr[3 ] ^ + network_addr[4 ] ^ network_addr[5 ] ^ network_addr[6 ] ^ network_addr[7 ] ^ + network_addr[8 ];return x & (NAT25_HASH_SIZE -1 ); }else if (network_addr[0 ] ==NAT25_IPV6 ) {unsigned long x; - x = network_addr[1 ] ^ network_addr[2 ] ^ network_addr[3 ] ^ network_addr[4 ] ^ network_addr[5 ] ^ - network_addr[6 ] ^ network_addr[7 ] ^ network_addr[8 ] ^ network_addr[9 ] ^ network_addr[10 ] ^ - network_addr[11 ] ^ network_addr[12 ] ^ network_addr[13 ] ^ network_addr[14 ] ^ network_addr[15 ] ^ - network_addr[16 ]; + x = network_addr[1 ] ^ network_addr[2 ] ^ network_addr[3 ] ^ network_addr[4 ] ^ + network_addr[5 ] ^ network_addr[6 ] ^ network_addr[7 ] ^ network_addr[8 ] ^ + network_addr[9 ] ^ network_addr[10 ] ^ network_addr[11 ] ^ network_addr[12 ] ^ + network_addr[13 ] ^ network_addr[14 ] ^ network_addr[15 ] ^ network_addr[16 ];return x & (NAT25_HASH_SIZE -1 ); }else {
--
2.30.2
PATCH v3 3/10 staging: r8188eu: remove {} for single statement blocks
In reply to Deepak R VarmaAs per the Linux kernel coding-style guidelines, there is no need to use {} for single statement blocks. Issue flagged by checkpatch script.
Signed-off-by Deepak R Varma <[email protected]>
---
Changes in v3:
-- None.
Changes in v1 [actually v2]:
1. Improve patch description language to make it simpler. Feedback received from [email protected]
drivers/staging/r8188eu/core/rtw_br_ext.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/r8188eu/core/rtw_br_ext.c +1 -2
@@ -652,9 +652,8 @@ void *scdb_findEntry(struct adapter *priv, unsigned char *ip_addr) hash =__nat25_network_hash (network_addr); db = priv->nethash[hash];while (db) { -if (!memcmp (db->networkAddr, network_addr,MAX_NETWORK_ADDR_LEN )) { +if (!memcmp (db->networkAddr, network_addr,MAX_NETWORK_ADDR_LEN ))return (void *)db; - } db = db->next_hash; }
--
2.30.2
PATCH v3 4/10 staging: r8188eu: use htons macro instead of __constant_htons
In reply to Deepak R VarmaMacro "htons" is more efficient and clearer. It should be used for constants instead of the __constant_htons macro. Resolves following checkpatch script complaint:
WARNING: __constant_htons should be htons
Signed-off-by Deepak R Varma <[email protected]>
---
Changes in v3:
1. Make this a driver-wide change. Feedback from [email protected]
2. Correct spelling in patch log. Feedback from [email protected]
drivers/staging/r8188eu/core/rtw_br_ext.c | 6 +++--- drivers/staging/r8188eu/core/rtw_xmit.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/r8188eu/core/rtw_br_ext.c +3 -3
@@ -609,14 +609,14 @@ void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb)if (!priv->ethBrExtInfo.dhcp_bcst_disable) {__be16 protocol = *((__be16 *)(skb->data +2 *ETH_ALEN )); -if (protocol ==__constant_htons (ETH_P_IP )) {/* IP */ +if (protocol ==htons (ETH_P_IP )) {/* IP */ struct iphdr *iph = (struct iphdr *)(skb->data +ETH_HLEN );if (iph->protocol ==IPPROTO_UDP ) {/* UDP */ struct udphdr *udph = (struct udphdr *)((size_t )iph + (iph->ihl <<2 )); -if ((udph->source ==__constant_htons (CLIENT_PORT )) && - (udph->dest ==__constant_htons (SERVER_PORT ))) {/* DHCP request */ +if ((udph->source ==htons (CLIENT_PORT )) && + (udph->dest ==htons (SERVER_PORT ))) {/* DHCP request */ struct dhcpMessage *dhcph = (struct dhcpMessage *)((size_t )udph +sizeof (struct udphdr ));u32 cookie =be32_to_cpu ((__be32 )dhcph->cookie);
drivers/staging/r8188eu/core/rtw_xmit.c +7 -7
@@ -1622,14 +1622,14 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)spin_lock_bh (&padapter->br_ext_lock);if (!(skb->data[0 ] &1 ) && br_port &&memcmp (skb->data +ETH_ALEN , padapter->br_mac,ETH_ALEN ) && - *((__be16 *)(skb->data +ETH_ALEN *2 )) !=__constant_htons (ETH_P_8021Q ) && - *((__be16 *)(skb->data +ETH_ALEN *2 )) ==__constant_htons (ETH_P_IP ) && + *((__be16 *)(skb->data +ETH_ALEN *2 )) !=htons (ETH_P_8021Q ) && + *((__be16 *)(skb->data +ETH_ALEN *2 )) ==htons (ETH_P_IP ) && !memcmp (padapter->scdb_mac, skb->data +ETH_ALEN ,ETH_ALEN ) && padapter->scdb_entry) {memcpy (skb->data +ETH_ALEN ,GET_MY_HWADDR (padapter),ETH_ALEN ); padapter->scdb_entry->ageing_timer = jiffies;spin_unlock_bh (&padapter->br_ext_lock); }else { -if (*((__be16 *)(skb->data +ETH_ALEN *2 )) ==__constant_htons (ETH_P_8021Q )) { +if (*((__be16 *)(skb->data +ETH_ALEN *2 )) ==htons (ETH_P_8021Q )) { is_vlan_tag =1 ; vlan_hdr = *((unsigned short *)(skb->data +ETH_ALEN *2 +2 ));for (i =0 ; i <6 ; i++)
@@ -1637,10 +1637,10 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)skb_pull (skb,4 ); }if (!memcmp (skb->data +ETH_ALEN , padapter->br_mac,ETH_ALEN ) && - (*((__be16 *)(skb->data +ETH_ALEN *2 )) ==__constant_htons (ETH_P_IP ))) + (*((__be16 *)(skb->data +ETH_ALEN *2 )) ==htons (ETH_P_IP )))memcpy (padapter->br_ip, skb->data +WLAN_ETHHDR_LEN +12 ,4 ); -if (*((__be16 *)(skb->data +ETH_ALEN *2 )) ==__constant_htons (ETH_P_IP )) { +if (*((__be16 *)(skb->data +ETH_ALEN *2 )) ==htons (ETH_P_IP )) {if (memcmp (padapter->scdb_mac, skb->data +ETH_ALEN ,ETH_ALEN )) { padapter->scdb_entry = (struct nat25_network_db_entry *)scdb_findEntry (padapter, skb->data +WLAN_ETHHDR_LEN +12 );
@@ -1669,7 +1669,7 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)skb_push (skb,4 );for (i =0 ; i <6 ; i++) *((unsigned short *)(skb->data + i *2 )) = *((unsigned short *)(skb->data +4 + i *2 )); - *((__be16 *)(skb->data +ETH_ALEN *2 )) =__constant_htons (ETH_P_8021Q ); + *((__be16 *)(skb->data +ETH_ALEN *2 )) =htons (ETH_P_8021Q ); *((unsigned short *)(skb->data +ETH_ALEN *2 +2 )) = vlan_hdr; }
@@ -1708,7 +1708,7 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb)skb_push (skb,4 );for (i =0 ; i <6 ; i++) *((unsigned short *)(skb->data + i *2 )) = *((unsigned short *)(skb->data +4 + i *2 )); - *((__be16 *)(skb->data +ETH_ALEN *2 )) =__constant_htons (ETH_P_8021Q ); + *((__be16 *)(skb->data +ETH_ALEN *2 )) =htons (ETH_P_8021Q ); *((unsigned short *)(skb->data +ETH_ALEN *2 +2 )) = vlan_hdr; } }
--
2.30.2
PATCH v3 5/10 staging: r8188eu: correct misspelled words in comments
In reply to Deepak R VarmaIncorrectly spelled words should be corrected as per the Linux coding-style guidelines. The corrections proposed by this patch are driver wide and are part of code comments.
Signed-off-by Deepak R Varma <[email protected]>
---
Changes in v3:
1. Patch newly added to the patch set.
drivers/staging/r8188eu/core/rtw_ioctl_set.c | 2 +- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 36 +++++++++---------- drivers/staging/r8188eu/core/rtw_recv.c | 8 ++--- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 2 +- drivers/staging/r8188eu/hal/odm_RTL8188E.c | 2 +- .../staging/r8188eu/hal/rtl8188e_hal_init.c | 2 +- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 4 +-- .../staging/r8188eu/include/Hal8188EPhyReg.h | 4 +-- .../staging/r8188eu/include/rtl8188e_hal.h | 2 +- .../staging/r8188eu/include/rtl8188e_spec.h | 6 ++-- drivers/staging/r8188eu/include/rtw_cmd.h | 4 +-- drivers/staging/r8188eu/include/rtw_recv.h | 4 +-- drivers/staging/r8188eu/include/rtw_xmit.h | 2 +- drivers/staging/r8188eu/include/wifi.h | 12 +++---- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 6 ++-- 15 files changed, 48 insertions(+), 48 deletions(-)
drivers/staging/r8188eu/core/rtw_ioctl_set.c +1 -1
@@ -287,7 +287,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) {if (check_fwstate (pmlmepriv, _FW_LINKED)) -rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have chked whether issue dis-assoc_cmd or not */ +rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have cheked whether issue dis-assoc_cmd or not */ } *pold_state = networktype;
drivers/staging/r8188eu/core/rtw_mlme_ext.c +18 -18
@@ -137,7 +137,7 @@ static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = { {0x03}, /* 0x41, RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN_2G */ }; -static struct rt_channel_plan_map RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03 };/* use the conbination for max channel numbers */ +static struct rt_channel_plan_map RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03 };/* use the combination for max channel numbers */ /* * Search the @param channel_num in given @param channel_set
@@ -1754,7 +1754,7 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr) p2pie[p2pielen++] =0x09 ;/* WFA P2P v1.0 */ /* Commented by Albert 20110306 */ -/* According to the P2P Specification, the group negoitation request frame should contain 9 P2P attributes */ +/* According to the P2P Specification, the group negotiation request frame should contain 9 P2P attributes */ /* 1. P2P Capability */ /* 2. Group Owner Intent */ /* 3. Configuration Timeout */
@@ -2109,7 +2109,7 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frame p2pie[p2pielen++] =0x09 ;/* WFA P2P v1.0 */ /* Commented by Albert 20100908 */ -/* According to the P2P Specification, the group negoitation response frame should contain 9 P2P attributes */ +/* According to the P2P Specification, the group negotiation response frame should contain 9 P2P attributes */ /* 1. Status */ /* 2. P2P Capability */ /* 3. Group Owner Intent */
@@ -2405,7 +2405,7 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result) p2pie[p2pielen++] =0x09 ;/* WFA P2P v1.0 */ /* Commented by Albert 20110306 */ -/* According to the P2P Specification, the group negoitation request frame should contain 5 P2P attributes */ +/* According to the P2P Specification, the group negotiation request frame should contain 5 P2P attributes */ /* 1. Status */ /* 2. P2P Capability */ /* 3. Operating Channel */
@@ -4013,7 +4013,7 @@ struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv)/**************************************************************************** -Following are some TX fuctions for WiFi MLME +Following are some TX functions for WiFi MLME *****************************************************************************/
@@ -4615,7 +4615,7 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid,return ret; } -/* if psta == NULL, indiate we are station(client) now... */ +/* if psta == NULL, indicate we are station(client) now... */ void issue_auth (struct adapter *padapter,struct sta_info *psta,unsigned short status) {struct xmit_frame *pmgntframe;
@@ -5014,7 +5014,7 @@ void issue_assocreq(struct adapter *padapter)if (!padapter->registrypriv.wifi_spec) {/* Commented by Kurt 20110629 */ /* In some older APs, WPS handshake */ -/* would be fail if we append vender extensions informations to AP */ +/* would be fail if we append vender extensions information to AP */ if (!memcmp (pIE->data,WPS_OUI ,4 )) pIE->Length =14 ; }
@@ -5169,7 +5169,7 @@ void issue_assocreq(struct adapter *padapter)kfree (pmlmepriv->assoc_req); } -/* when wait_ack is ture, this function shoule be called at process context */ +/* when wait_ack is true, this function should be called at process context */ static int _issue_nulldata (struct adapter *padapter,unsigned char *da,unsigned int power_mode,int wait_ack) {int ret = _FAIL;
@@ -5238,7 +5238,7 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsignedreturn ret; } -/* when wait_ms > 0 , this function shoule be called at process context */ +/* when wait_ms > 0 , this function should be called at process context */ /* da == NULL for station mode */ int issue_nulldata (struct adapter *padapter,unsigned char *da,unsigned int power_mode,int try_cnt,int wait_ms) {
@@ -5247,7 +5247,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int powstruct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -/* da == NULL, assum it's null data for sta to ap*/ +/* da == NULL, assume it's null data for sta to ap*/ if (!da) da =get_my_bssid (&pmlmeinfo->network);
@@ -5271,7 +5271,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int powreturn ret; } -/* when wait_ack is ture, this function shoule be called at process context */ +/* when wait_ack is true, this function should be called at process context */ static int _issue_qos_nulldata (struct adapter *padapter,unsigned char *da,u16 tid,int wait_ack) {int ret = _FAIL;
@@ -5344,7 +5344,7 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16return ret; } -/* when wait_ms > 0 , this function shoule be called at process context */ +/* when wait_ms > 0 , this function should be called at process context */ /* da == NULL for station mode */ int issue_qos_nulldata (struct adapter *padapter,unsigned char *da,u16 tid,int try_cnt,int wait_ms) {
@@ -5353,7 +5353,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, intstruct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; -/* da == NULL, assum it's null data for sta to ap*/ +/* da == NULL, assume it's null data for sta to ap*/ if (!da) da =get_my_bssid (&pmlmeinfo->network);
@@ -5885,7 +5885,7 @@ static void rtw_set_opmode(struct adapter *adapter, u8 mode)/**************************************************************************** -Following are some utitity fuctions for WiFi MLME +Following are some utility functions for WiFi MLME *****************************************************************************/
@@ -6058,7 +6058,7 @@ void site_survey(struct adapter *padapter) }else {/* 20100721:Interrupt scan operation here. */ /* For SW antenna diversity before link, it needs to switch to another antenna and scan again. */ -/* It compares the scan result and select beter one to do connection. */ +/* It compares the scan result and select better one to do connection. */ if (AntDivBeforeLink8188E (padapter)) { pmlmeext->sitesurvey_res.bss_cnt =0 ; pmlmeext->sitesurvey_res.channel_idx =-1 ;
@@ -6328,7 +6328,7 @@ void start_create_ibss(struct adapter *padapter)/* update wireless mode */ update_wireless_mode (padapter); -/* udpate capability */ +/* update capability */ caps =rtw_get_capability ((struct wlan_bssid_ex *)pnetwork);update_capinfo (padapter, caps);if (caps & cap_IBSS) {/* adhoc master */
@@ -6378,7 +6378,7 @@ void start_clnt_join(struct adapter *padapter)/* update wireless mode */ update_wireless_mode (padapter); -/* udpate capability */ +/* update capability */ caps =rtw_get_capability ((struct wlan_bssid_ex *)pnetwork);update_capinfo (padapter, caps);if (caps & cap_ESS) {
@@ -6972,7 +6972,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)/* BCN interval */ rtw_write16 (padapter,REG_BCN_INTERVAL , pmlmeinfo->bcn_interval); -/* udpate capability */ +/* update capability */ update_capinfo (padapter, pmlmeinfo->capability);/* WMM, Update EDCA param */
drivers/staging/r8188eu/core/rtw_recv.c +4 -4
@@ -972,7 +972,7 @@ static void validate_recv_ctrl_frame(struct adapter *padapter,if (psta->sleepq_len ==0 ) { pstapriv->tim_bitmap &= ~BIT (psta->aid); -/* upate BCN for TIM IE */ +/* update BCN for TIM IE */ /* update_BCNTIM(padapter); */ update_beacon (padapter, _TIM_IE_,NULL , false); }
@@ -986,7 +986,7 @@ static void validate_recv_ctrl_frame(struct adapter *padapter, pstapriv->tim_bitmap &= ~BIT (psta->aid); -/* upate BCN for TIM IE */ +/* update BCN for TIM IE */ /* update_BCNTIM(padapter); */ update_beacon (padapter, _TIM_IE_,NULL , false); }
@@ -1984,13 +1984,13 @@ static void rtw_signal_stat_timer_hdl(struct timer_list *t) }else {if (recvpriv->signal_strength_data.update_req ==0 ) {/* update_req is clear, means we got rx */ avg_signal_strength = recvpriv->signal_strength_data.avg_val; -/* after avg_vals are accquired, we can re-stat the signal values */ +/* after avg_vals are acquired, we can re-stat the signal values */ recvpriv->signal_strength_data.update_req =1 ; }if (recvpriv->signal_qual_data.update_req ==0 ) {/* update_req is clear, means we got rx */ avg_signal_qual = recvpriv->signal_qual_data.avg_val; -/* after avg_vals are accquired, we can re-stat the signal values */ +/* after avg_vals are acquired, we can re-stat the signal values */ recvpriv->signal_qual_data.update_req =1 ; }
drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +1 -1
@@ -69,7 +69,7 @@ void ODM_TxPwrTrackAdjust88E(struct odm_dm_struct *dm_odm, u8 Type,/* 0 = OFDM,/*----------------------------------------------------------------------------- * Function: odm_TxPwrTrackSetPwr88E() * -* Overview: 88E change all channel tx power accordign to flag. +* Overview: 88E change all channel tx power according to flag. * OFDM & CCK are all different. * * Input: NONE
drivers/staging/r8188eu/hal/odm_RTL8188E.c +1 -1
@@ -194,7 +194,7 @@ static void odm_HWAntDiv(struct odm_dm_struct *dm_odm)for (i =0 ; i <ODM_ASSOCIATE_ENTRY_NUM ; i++) { pEntry = dm_odm->pODM_StaInfo[i];if (IS_STA_VALID (pEntry)) { -/* 2 Caculate RSSI per Antenna */ +/* 2 Calculate RSSI per Antenna */ Main_RSSI = (dm_fat_tbl->MainAnt_Cnt[i] !=0 ) ? (dm_fat_tbl->MainAnt_Sum[i] / dm_fat_tbl->MainAnt_Cnt[i]) :0 ; Aux_RSSI = (dm_fat_tbl->AuxAnt_Cnt[i] !=0 ) ? (dm_fat_tbl->AuxAnt_Sum[i] / dm_fat_tbl->AuxAnt_Cnt[i]) :0 ; TargetAnt = (Main_RSSI >= Aux_RSSI) ?MAIN_ANT :AUX_ANT ;
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +1 -1
@@ -355,7 +355,7 @@ void rtl8188e_EfusePowerSwitch(struct adapter *pAdapter, u8 PwrState)if (PwrState) {rtw_write8 (pAdapter,REG_EFUSE_ACCESS ,EFUSE_ACCESS_ON ); -/* 1.2V Power: From VDDON with Power Cut(0x0000h[15]), defualt valid */ +/* 1.2V Power: From VDDON with Power Cut(0x0000h[15]), default valid */ res =rtw_read16 (pAdapter,REG_SYS_ISO_CTRL , &tmpV16);if (res)return ;
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +2 -2
@@ -94,7 +94,7 @@ void rtl8188e_PHY_SetBBReg(struct adapter *Adapter, u32 RegAddr, u32 BitMask, u3/** * Function: phy_RFSerialRead * -* OverView: Read regster from RF chips +* OverView: Read register from RF chips * * Input: * struct adapter *Adapter,
@@ -363,7 +363,7 @@ phy_InitBBRFRegisterDefinition(/* RF Interface (Output and) Enable */ pHalData->PHYRegDef.rfintfe = rFPGA0_XA_RFInterfaceOE;/* 16 MSBs if read 32-bit from 0x860 (16-bit for 0x862) */ -/* Addr of LSSI. Wirte RF register by driver */ +/* Addr of LSSI. Write RF register by driver */ pHalData->PHYRegDef.rf3wireOffset = rFPGA0_XA_LSSIParameter;/* LSSI Parameter */ /* RF parameter */
drivers/staging/r8188eu/include/Hal8188EPhyReg.h +2 -2
@@ -92,7 +92,7 @@#define rFPGA0_AdDaClockEn 0x888#define rFPGA0_AnalogParameter4 0x88c -#define rFPGA0_XA_LSSIReadBack 0x8a0/* Tranceiver LSSI Readback */ +#define rFPGA0_XA_LSSIReadBack 0x8a0/* Transceiver LSSI Readback */ #define rFPGA0_XB_LSSIReadBack 0x8a4#define rFPGA0_XC_LSSIReadBack 0x8a8#define rFPGA0_XD_LSSIReadBack 0x8ac
@@ -167,7 +167,7 @@/* RxIQ DC offset, Rx digital filter, DC notch filter */ #define rOFDM0_XARxAFE 0xc10 -#define rOFDM0_XARxIQImbalance 0xc14/* RxIQ imblance matrix */ +#define rOFDM0_XARxIQImbalance 0xc14/* RxIQ imbalance matrix */ #define rOFDM0_XBRxAFE 0xc18#define rOFDM0_XBRxIQImbalance 0xc1c#define rOFDM0_XCRxAFE 0xc20
drivers/staging/r8188eu/include/rtl8188e_hal.h +1 -1
@@ -88,7 +88,7 @@ struct txpowerinfo24g {/* 9bytes + 1byt + 5bytes and pre 1byte. */ /* For worst case: */ /* | 2byte|----8bytes----|1byte|--7bytes--| 92D */ -/* PG data exclude header, dummy 7 bytes frome CP test and reserved 1byte. */ +/* PG data exclude header, dummy 7 bytes from CP test and reserved 1byte. */ #define EFUSE_OOB_PROTECT_BYTES_88E 18#define EFUSE_PROTECT_BYTES_BANK 16
drivers/staging/r8188eu/include/rtl8188e_spec.h +3 -3
@@ -4,7 +4,7 @@#ifndef __RTL8188E_SPEC_H__#define __RTL8188E_SPEC_H__ -/* 8192C Regsiter offset definition */ +/* 8192C Register offset definition */ #define HAL_PS_TIMER_INT_DELAY 50/* 50 microseconds */ #define HAL_92C_NAV_UPPER_UNIT 128/* micro-second */
@@ -674,7 +674,7 @@ Current IOREG MAP#define REG_USB_HRPWM 0xFE58#define REG_USB_HCPWM 0xFE57 -/* 8192C Regsiter Bit and Content definition */ +/* 8192C Register Bit and Content definition */ /* 0x0000h ~ 0x00FFh System Configuration */ /* 2 SYS_ISO_CTRL */
@@ -1135,7 +1135,7 @@ Current IOREG MAP#define EEPROM_Default_CrystalCap_88E 0x20#define EEPROM_Default_ThermalMeter_88E 0x18 -/* New EFUSE deafult value */ +/* New EFUSE default value */ #define EEPROM_DEFAULT_24G_INDEX 0x2D#define EEPROM_DEFAULT_24G_HT20_DIFF 0X02#define EEPROM_DEFAULT_24G_OFDM_DIFF 0X04
drivers/staging/r8188eu/include/rtw_cmd.h +2 -2
@@ -455,7 +455,7 @@ struct Tx_Beacon_param mac[0 ] ==0 ==> CMD mode, return H2C_SUCCESS. - The following condition must be ture under CMD mode + The following condition must be true under CMD mode mac[1 ] == mac[4 ], mac[2 ] == mac[3 ], mac[0 ]=mac[5 ]=0 ; s0 ==0x1234 , s1 ==0xabcd , w0 ==0x78563412 , w1 ==0x5aa5def7 ; s2 == (b1 <<8 | b0);
@@ -508,7 +508,7 @@ struct drvextra_cmd_parm {unsigned char *pbuf; }; -/*------------------- Below are used for RF/BB tunning ---------------------*/ +/*------------------- Below are used for RF/BB tuning ---------------------*/ struct setantenna_parm {u8 tx_antset;
drivers/staging/r8188eu/include/rtw_recv.h +2 -2
@@ -92,7 +92,7 @@ struct rx_pkt_attrib {u8 privacy;/* in frame_ctrl field */ u8 bdecrypted;u8 encrypt;/* when 0 indicate no encrypt. when non-zero, -* indicate the encrypt algorith */ +* indicate the encrypt algorithm */ u8 iv_len;u8 icv_len;u8 crc_err;
@@ -175,7 +175,7 @@ struct recv_priv {u8 *precv_buf;/* 4 alignment */ struct __queue free_recv_buf_queue;u32 free_recv_buf_queue_cnt; -/* For display the phy informatiom */ +/* For display the phy information */ u8 is_signal_dbg;/* for debug */ u8 signal_strength_dbg;/* for debug */ s8 rssi;
drivers/staging/r8188eu/include/rtw_xmit.h +1 -1
@@ -116,7 +116,7 @@ struct pkt_attrib {u32 last_txcmdsz;u8 nr_frags;u8 encrypt;/* when 0 indicate no encrypt. when non-zero, -* indicate the encrypt algorith */ +* indicate the encrypt algorithm */ u8 iv_len;u8 icv_len;u8 iv[18 ];
drivers/staging/r8188eu/include/wifi.h +6 -6
@@ -701,7 +701,7 @@ struct ADDBA_request {#define P2P_WILDCARD_SSID_LEN 7 -/* default value, used when: (1)p2p disabed or (2)p2p enabled +/* default value, used when: (1)p2p disabled or (2)p2p enabled * but only do 1 scan phase */ #define P2P_FINDPHASE_EX_NONE 0/* used when p2p enabled and want to do 1 scan phase and
@@ -766,11 +766,11 @@ enum P2P_STATE {P2P_STATE_TX_PROVISION_DIS_REQ =6 ,P2P_STATE_RX_PROVISION_DIS_RSP =7 ,P2P_STATE_RX_PROVISION_DIS_REQ =8 , -/* Doing the group owner negoitation handshake */ +/* Doing the group owner negotiation handshake */ P2P_STATE_GONEGO_ING =9 , -/* finish the group negoitation handshake with success */ +/* finish the group negotiation handshake with success */ P2P_STATE_GONEGO_OK =10 , -/* finish the group negoitation handshake with failure */ +/* finish the group negotiation handshake with failure */ P2P_STATE_GONEGO_FAIL =11 ,/* receiving the P2P Inviation request and match with the profile. */ P2P_STATE_RECV_INVITE_REQ_MATCH = 12,
@@ -790,9 +790,9 @@ enum P2P_STATE {P2P_STATE_RECV_INVITE_REQ_JOIN =19 ,/* recveing the P2P Inviation response with failure */ P2P_STATE_RX_INVITE_RESP_FAIL =20 , -/* receiving p2p negoitation response with information is not available */ +/* receiving p2p negotiation response with information is not available */ P2P_STATE_RX_INFOR_NOREADY =21 , -/* sending p2p negoitation response with information is not available */ +/* sending p2p negotiation response with information is not available */ P2P_STATE_TX_INFOR_NOREADY = 22, };
drivers/staging/r8188eu/os_dep/ioctl_linux.c +3 -3
@@ -2647,7 +2647,7 @@ static int rtw_p2p_connect(struct net_device *dev,u32 peer_channel =0 ;/* Commented by Albert 20110304 */ -/* The input data contains two informations. */ +/* The input data contains two information. */ /* 1. First information is the MAC address which wants to formate with */ /* 2. Second information is the WPS PINCode or "pbc" string for push button method */ /* Format: 00:E0:4C:00:00:05 */
@@ -2721,7 +2721,7 @@ static void rtw_p2p_invite_req(struct net_device *dev,uint p2pielen =0 , attr_contentlen =0 ;struct tx_invite_req_info *pinvite_req_info = &pwdinfo->invitereq_info; -/* The input data contains two informations. */ +/* The input data contains two information items. */ /* 1. First information is the P2P device address which you want to send to. */ /* 2. Second information is the group id which combines with GO's mac address, space and GO's ssid. */ /* Command line sample: iwpriv wlan0 p2p_set invite ="00:11:22:33:44:55 00:E0:4C:00:00:05 DIRECT-xy" */
@@ -2845,7 +2845,7 @@ static void rtw_p2p_prov_disc(struct net_device *dev,u8 *p2pie;uint p2pielen =0 , attr_contentlen =0 ; -/* The input data contains two informations. */ +/* The input data contains two information items. */ /* 1. First information is the MAC address which wants to issue the provisioning discovery request frame. */ /* 2. Second information is the WPS configuration method which wants to discovery */ /* Format: 00:E0:4C:00:00:05_display */
--
2.30.2
PATCH v3 6/10 staging: r8188eu: Add space between function & macro parameters
In reply to Deepak R VarmaSpace required between function and macro parameters to improve code readability. This Linux kernel coding style guideline resolves following error reported by checkpatch script:
ERROR: space required after that ',' (ctx:VxV)
Signed-off-by Deepak R Varma <[email protected]>
---
Changes in v3:
1. Patch newly added to the patch set.
.../staging/r8188eu/include/osdep_service.h | 4 +-- .../staging/r8188eu/include/rtl8188e_hal.h | 2 +- drivers/staging/r8188eu/include/rtw_cmd.h | 4 +-- drivers/staging/r8188eu/include/rtw_io.h | 28 +++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-)
drivers/staging/r8188eu/include/osdep_service.h +2 -2
@@ -53,7 +53,7 @@ static inline struct list_head *get_list_head(struct __queue *queue)return (&(queue->queue)); } -static inline void _set_timer (struct timer_list *ptimer,u32 delay_time) +static inline void _set_timer (struct timer_list *ptimer,u32 delay_time) {mod_timer (ptimer, jiffies +msecs_to_jiffies (delay_time)); }
@@ -108,7 +108,7 @@ void rtw_free_netdev(struct net_device *netdev);#define FUNC_ADPT_FMT "%s(%s)"#define FUNC_ADPT_ARG (adapter) __func__, adapter->pnetdev->name -#define rtw_signal_process (pid, sig) kill_pid(find_vpid((pid)),(sig), 1) +#define rtw_signal_process (pid, sig) kill_pid(find_vpid((pid)), (sig), 1)/* Macros for handling unaligned memory accesses */
drivers/staging/r8188eu/include/rtl8188e_hal.h +1 -1
@@ -165,7 +165,7 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *hwinfo,void rtl8188e_EfuseParseChnlPlan (struct adapter *padapter,u8 *hwinfo,bool AutoLoadFail); -void Hal_ReadAntennaDiversity88E (struct adapter *pAdapter,u8 *PROMContent, +void Hal_ReadAntennaDiversity88E (struct adapter *pAdapter,u8 *PROMContent,bool AutoLoadFail);void Hal_ReadThermalMeter_88E (struct adapter * dapter,u8 *PROMContent,bool AutoloadFail);
drivers/staging/r8188eu/include/rtw_cmd.h +2 -2
@@ -740,7 +740,7 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra nu8 rtw_setdatarate_cmd (struct adapter *padapter,u8 *rateset);u8 rtw_setrfintfs_cmd (struct adapter *padapter,u8 mode); -u8 rtw_gettssi_cmd (struct adapter *padapter,u8 offset,u8 *pval); +u8 rtw_gettssi_cmd (struct adapter *padapter,u8 offset,u8 *pval);u8 rtw_setfwdig_cmd (struct adapter *padapter,u8 type);u8 rtw_setfwra_cmd (struct adapter *padapter,u8 type);
@@ -751,7 +751,7 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *adapter);u8 rtw_lps_ctrl_wk_cmd (struct adapter *padapter,u8 lps_ctrl_type,u8 enqueue);u8 rtw_rpt_timer_cfg_cmd (struct adapter *padapter,u16 minRptTime); -u8 rtw_antenna_select_cmd (struct adapter *padapter,u8 antenna,u8 enqueue); +u8 rtw_antenna_select_cmd (struct adapter *padapter,u8 antenna,u8 enqueue);u8 rtw_ps_cmd (struct adapter *padapter);u8 rtw_chk_hi_queue_cmd (struct adapter *padapter);
drivers/staging/r8188eu/include/rtw_io.h +14 -14
@@ -209,7 +209,7 @@ struct io_priv { };uint ioreq_flush (struct adapter *adapter,struct io_queue *ioqueue); -void sync_ioreq_enqueue (struct io_req *preq,struct io_queue *ioqueue); +void sync_ioreq_enqueue (struct io_req *preq,struct io_queue *ioqueue);uint sync_ioreq_flush (struct adapter *adapter,struct io_queue *ioqueue);uint free_ioreq (struct io_req *preq,struct io_queue *pio_queue);struct io_req *alloc_ioreq (struct io_queue *pio_q);
@@ -285,18 +285,18 @@ void bus_sync_io(struct io_queue *pio_q);u32 _ioreq2rwmem (struct io_queue *pio_q);void dev_power_down (struct adapter *Adapter,u8 bpwrup); -#define PlatformEFIOWrite1Byte (_a,_b,_c) \ - rtw_write8(_a,_b,_c) -#define PlatformEFIOWrite2Byte (_a,_b,_c) \ - rtw_write16(_a,_b,_c) -#define PlatformEFIOWrite4Byte (_a,_b,_c) \ - rtw_write32(_a,_b,_c) - -#define PlatformEFIORead1Byte (_a,_b) \ - rtw_read8(_a,_b) -#define PlatformEFIORead2Byte (_a,_b) \ - rtw_read16(_a,_b) -#define PlatformEFIORead4Byte (_a,_b) \ - rtw_read32(_a,_b) +#define PlatformEFIOWrite1Byte (_a, _b, _c) \ + rtw_write8(_a, _b, _c) +#define PlatformEFIOWrite2Byte (_a, _b, _c) \ + rtw_write16(_a, _b, _c) +#define PlatformEFIOWrite4Byte (_a, _b, _c) \ + rtw_write32(_a, _b, _c) + +#define PlatformEFIORead1Byte (_a, _b) \ + rtw_read8(_a, _b) +#define PlatformEFIORead2Byte (_a, _b) \ + rtw_read16(_a, _b) +#define PlatformEFIORead4Byte (_a, _b) \ + rtw_read32(_a, _b)#endif /* _RTL8711_IO_H_ */
--
2.30.2
PATCH v3 7/10 staging: r8188eu: Associate pointer symbol with parameter name
In reply to Deepak R VarmaThe pointer symbol '*' should be associated with the function parameter name and not its type. This improves code readability and adheres to the coding-style guidelines. Address following checkpatch reported error:
ERROR: "foo * bar" should be "foo *bar"
While in there, update parameter name at one place to match other function declarations.
Signed-off-by Deepak R Varma <[email protected]>
---
Changes in v3:
1. Patch newly added to the patch set.
.../staging/r8188eu/include/rtl8188e_hal.h | 2 +- drivers/staging/r8188eu/include/rtw_cmd.h | 20 +++++++++---------- .../staging/r8188eu/include/rtw_ioctl_set.h | 4 ++-- drivers/staging/r8188eu/include/rtw_mlme.h | 2 +- .../staging/r8188eu/include/rtw_mlme_ext.h | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-)
drivers/staging/r8188eu/include/rtl8188e_hal.h +1 -1
@@ -167,7 +167,7 @@ void rtl8188e_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail);void Hal_ReadAntennaDiversity88E (struct adapter *pAdapter,u8 *PROMContent,bool AutoLoadFail); -void Hal_ReadThermalMeter_88E (struct adapter * dapter,u8 *PROMContent, +void Hal_ReadThermalMeter_88E (struct adapter *padapter,u8 *PROMContent,bool AutoloadFail);void Hal_EfuseParseXtal_8188E (struct adapter *pAdapter,u8 *hwinfo,bool AutoLoadFail);
drivers/staging/r8188eu/include/rtw_cmd.h +10 -10
@@ -734,27 +734,27 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,u8 rtw_createbss_cmd (struct adapter *padapter);u8 rtw_setstakey_cmd (struct adapter *padapter,u8 *psta,u8 unicast_key);u8 rtw_clearstakey_cmd (struct adapter *padapter,u8 *psta,u8 entry,u8 enqueue); -u8 rtw_joinbss_cmd (struct adapter *padapter,struct wlan_network * pnetwork); +u8 rtw_joinbss_cmd (struct adapter *padapter,struct wlan_network *pnetwork);u8 rtw_disassoc_cmd (struct adapter *padapter,u32 deauth_timeout_ms,bool enqueue);u8 rtw_setopmode_cmd (struct adapter *padapter,enum ndis_802_11_network_infra networktype);u8 rtw_setdatarate_cmd (struct adapter *padapter,u8 *rateset);u8 rtw_setrfintfs_cmd (struct adapter *padapter,u8 mode); -u8 rtw_gettssi_cmd (struct adapter *padapter,u8 offset,u8 *pval); -u8 rtw_setfwdig_cmd (struct adapter *padapter,u8 type); -u8 rtw_setfwra_cmd (struct adapter *padapter,u8 type); +u8 rtw_gettssi_cmd (struct adapter *padapter,u8 offset,u8 *pval); +u8 rtw_setfwdig_cmd (struct adapter *padapter,u8 type); +u8 rtw_setfwra_cmd (struct adapter *padapter,u8 type); -u8 rtw_addbareq_cmd (struct adapter *padapter,u8 tid,u8 *addr); +u8 rtw_addbareq_cmd (struct adapter *padapter,u8 tid,u8 *addr);u8 rtw_dynamic_chk_wk_cmd (struct adapter *adapter); -u8 rtw_lps_ctrl_wk_cmd (struct adapter *padapter,u8 lps_ctrl_type,u8 enqueue); -u8 rtw_rpt_timer_cfg_cmd (struct adapter *padapter,u16 minRptTime); +u8 rtw_lps_ctrl_wk_cmd (struct adapter *padapter,u8 lps_ctrl_type,u8 enqueue); +u8 rtw_rpt_timer_cfg_cmd (struct adapter *padapter,u16 minRptTime); -u8 rtw_antenna_select_cmd (struct adapter *padapter,u8 antenna,u8 enqueue); -u8 rtw_ps_cmd (struct adapter *padapter); +u8 rtw_antenna_select_cmd (struct adapter *padapter,u8 antenna,u8 enqueue); +u8 rtw_ps_cmd (struct adapter *padapter); -u8 rtw_chk_hi_queue_cmd (struct adapter *padapter); +u8 rtw_chk_hi_queue_cmd (struct adapter *padapter);u8 rtw_set_chplan_cmd (struct adapter *padapter,u8 chplan);
drivers/staging/r8188eu/include/rtw_ioctl_set.h +2 -2
@@ -10,10 +10,10 @@ typedef u8 NDIS_802_11_PMKID_VALUE[16];u8 rtw_set_802_11_authentication_mode (struct adapter *adapt,enum ndis_802_11_auth_mode authmode); -u8 rtw_set_802_11_bssid (struct adapter *adapter,u8 *bssid); +u8 rtw_set_802_11_bssid (struct adapter *adapter,u8 *bssid);u8 rtw_set_802_11_add_wep (struct adapter *adapter,struct ndis_802_11_wep *wep);u8 rtw_set_802_11_disassociate (struct adapter *adapter); -u8 rtw_set_802_11_bssid_list_scan (struct adapter *adapter, +u8 rtw_set_802_11_bssid_list_scan (struct adapter *adapter,struct ndis_802_11_ssid *pssid,int ssid_max_num); u8 rtw_set_802_11_infrastructure_mode(struct adapter *adapter,
drivers/staging/r8188eu/include/rtw_mlme.h +1 -1
@@ -547,7 +547,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv,void _rtw_free_network_nolock (struct mlme_priv *pmlmepriv,struct wlan_network *pnetwork); -struct wlan_network *_rtw_find_network (struct __queue *scanned_queue,u8 *addr); +struct wlan_network *_rtw_find_network (struct __queue *scanned_queue,u8 *addr);void _rtw_free_network_queue (struct adapter *padapter,u8 isfreeall);
drivers/staging/r8188eu/include/rtw_mlme_ext.h +4 -4
@@ -479,11 +479,11 @@ void report_survey_event(struct adapter *padapter, struct recv_frame *precv_framvoid report_surveydone_event (struct adapter *padapter);void report_del_sta_event (struct adapter *padapter,unsigned char *addr,unsigned short reason); -void report_add_sta_event (struct adapter *padapter,unsigned char * addr, +void report_add_sta_event (struct adapter *padapter,unsigned char *addr,int cam_idx);void beacon_timing_control (struct adapter *padapter); -extern u8 set_tx_beacon_cmd (struct adapter *padapter); +extern u8 set_tx_beacon_cmd (struct adapter *padapter);unsigned int setup_beacon_frame (struct adapter *padapter,unsigned char *beacon_frame);void update_mgnt_tx_rate (struct adapter *padapter,u8 rate);
@@ -502,7 +502,7 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr);void issue_probereq_p2p (struct adapter *padapter,u8 *da);void issue_p2p_invitation_response (struct adapter *padapter,u8 *raddr,u8 dialogToken,u8 success); -void issue_p2p_invitation_request (struct adapter *padapter,u8 * raddr); +void issue_p2p_invitation_request (struct adapter *padapter,u8 *raddr);void issue_beacon (struct adapter *padapter,int timeout_ms);void issue_probersp (struct adapter *padapter,unsigned char *da,u8 is_valid_p2p_probereq);
@@ -514,7 +514,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta,void issue_probereq (struct adapter *padapter,struct ndis_802_11_ssid *pssid,u8 *da);s32 issue_probereq_ex (struct adapter *adapter,struct ndis_802_11_ssid *pssid, -u8 * da,int try_cnt,int wait_ms); +u8 *da,int try_cnt,int wait_ms);int issue_nulldata (struct adapter *padapter,unsigned char *da,unsigned int power_mode,int try_cnt,int wait_ms); int issue_qos_nulldata(struct adapter *padapter, unsigned char *da,
--
2.30.2
PATCH v3 8/10 staging: r8188eu: replace leading spaces by tabs
In reply to Deepak R VarmaSpaces are prohibited as per the Linux coding style guidelines. Replace those by tabs wherever possible to improve code alignment. Error reported by checkpatch script.
Signed-off-by Deepak R Varma <[email protected]>
---
Changes in v3:
1. Patch newly added in the patch set.
drivers/staging/r8188eu/include/rtw_cmd.h | 10 +++++----- drivers/staging/r8188eu/include/rtw_mlme.h | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/staging/r8188eu/include/rtw_cmd.h +5 -5
@@ -592,14 +592,14 @@ struct setratable_parm { };struct getratable_parm { -uint rsvd; +uint rsvd; };struct getratable_rsp { -u8 ss_ForceUp[NumRates]; -u8 ss_ULevel[NumRates]; -u8 ss_DLevel[NumRates]; -u8 count_judge[NumRates]; +u8 ss_ForceUp[NumRates]; +u8 ss_ULevel[NumRates]; +u8 ss_DLevel[NumRates]; +u8 count_judge[NumRates]; };/* to get TX,RX retry count */
drivers/staging/r8188eu/include/rtw_mlme.h +1 -1
@@ -528,7 +528,7 @@ void rtw_indicate_scan_done(struct adapter *padapter);int rtw_restruct_sec_ie (struct adapter *adapter,u8 *in_ie,u8 *out_ie,uint in_len);int rtw_restruct_wmm_ie (struct adapter *adapter,u8 *in_ie,u8 *out_ie, -uint in_len,uint initial_out_len); +uint in_len,uint initial_out_len);void rtw_init_registrypriv_dev_network (struct adapter *adapter);void rtw_update_registrypriv_dev_network (struct adapter *adapter);
drivers/staging/r8188eu/include/rtw_mlme_ext.h +1 -1
@@ -449,7 +449,7 @@ void ERP_IE_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE);void VCS_update (struct adapter *padapter,struct sta_info *psta);void update_beacon_info (struct adapter *padapter,u8 *pframe,uint len, -struct sta_info *psta); +struct sta_info *psta);int rtw_check_bcn_info (struct adapter *Adapter,u8 *pframe,u32 packet_len);void update_IOT_info (struct adapter *padapter);void update_capinfo (struct adapter *adapter,u16 updatecap);
--
2.30.2
PATCH v3 9/10 staging: r8188eu: Put '{" on the symbol declaration line
In reply to Deepak R VarmaOpen braces '{" should be placed on the line of symbol declaration as per the coding-style guidelines. Improves readability and matches with style used in rest of the code. Issue reported by checkpatch script.
Signed-off-by Deepak R Varma <[email protected]>
---
Changes in v3:
1. Patch newly added to the patch set.
drivers/staging/r8188eu/include/rtw_cmd.h | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
drivers/staging/r8188eu/include/rtw_cmd.h +6 -12
@@ -445,8 +445,7 @@ struct getrfintfs_parm {u8 rfintfs; }; -struct Tx_Beacon_param -{ +struct Tx_Beacon_param {struct wlan_bssid_ex network; };
@@ -682,26 +681,22 @@ struct set_ch_parm { };/*H2C Handler index: 59 */ -struct SetChannelPlan_param -{ +struct SetChannelPlan_param {u8 channel_plan; };/*H2C Handler index: 60 */ -struct LedBlink_param -{ +struct LedBlink_param {struct LED_871x *pLed; };/*H2C Handler index: 61 */ -struct SetChannelSwitch_param -{ +struct SetChannelSwitch_param {u8 new_ch_no; };/*H2C Handler index: 62 */ -struct TDLSoption_param -{ +struct TDLSoption_param {u8 addr[ETH_ALEN ];u8 option; };
@@ -859,8 +854,7 @@ enum rtw_h2c_cmd {#define _SetRFReg_CMD_ _Write_RFREG_CMD_#ifdef _RTW_CMD_C_ -static struct _cmd_callback rtw_cmd_callback[] = -{ +static struct _cmd_callback rtw_cmd_callback[] = { {GEN_CMD_CODE (_Read_MACREG),NULL },/*0*/ {GEN_CMD_CODE (_Write_MACREG),NULL }, {GEN_CMD_CODE(_Read_BBREG), &rtw_getbbrfreg_cmdrsp_callback},
--
2.30.2
PATCH v3 10/10 staging: r8188eu: Correct missing or extra space in the statements
In reply to Deepak R VarmaProperly spacing out code statements/instructions improves code readability. Add missing or remove extra space as necessary according to the Linux Kernel coding-style guidelines. Following errors reported by checkpatch script for inconsistent code spacing:
ERROR: space prohibited before that close parenthesis ')'
ERROR: space prohibited before that ',' (ctx:WxW)
CHECK: spaces preferred around that '&' (ctx:VxV)
Signed-off-by Deepak R Varma <[email protected]>
---
Changes in v3:
1. Patch newly added to the patch set.
.../staging/r8188eu/include/rtl8188e_spec.h | 12 ++++++------ drivers/staging/r8188eu/include/rtw_mlme.h | 18 +++++++++--------- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-)
drivers/staging/r8188eu/include/rtl8188e_spec.h +6 -6
@@ -900,12 +900,12 @@ Current IOREG MAP#define HQSEL_HIQ BIT(5)/* For normal driver, 0x10C */ -#define _TXDMA_HIQ_MAP (x) (((x)&0x3) << 14) -#define _TXDMA_MGQ_MAP (x) (((x)&0x3) << 12) -#define _TXDMA_BKQ_MAP (x) (((x)&0x3) << 10) -#define _TXDMA_BEQ_MAP (x) (((x)&0x3) << 8 ) -#define _TXDMA_VIQ_MAP (x) (((x)&0x3) << 6 ) -#define _TXDMA_VOQ_MAP (x) (((x)&0x3) << 4 ) +#define _TXDMA_HIQ_MAP (x) (((x) & 0x3) << 14) +#define _TXDMA_MGQ_MAP (x) (((x) & 0x3) << 12) +#define _TXDMA_BKQ_MAP (x) (((x) & 0x3) << 10) +#define _TXDMA_BEQ_MAP (x) (((x) & 0x3) << 8) +#define _TXDMA_VIQ_MAP (x) (((x) & 0x3) << 6) +#define _TXDMA_VOQ_MAP (x) (((x) & 0x3) << 4)#define QUEUE_LOW 1#define QUEUE_NORMAL 2
drivers/staging/r8188eu/include/rtw_mlme.h +9 -9
@@ -101,17 +101,17 @@ struct rt_link_detect {struct profile_info {u8 ssidlen; -u8 ssid[WLAN_SSID_MAXLEN ]; -u8 peermac[ETH_ALEN ]; +u8 ssid[WLAN_SSID_MAXLEN ]; +u8 peermac[ETH_ALEN ]; };struct tx_invite_req_info {u8 token;u8 benable; -u8 go_ssid[WLAN_SSID_MAXLEN ]; +u8 go_ssid[WLAN_SSID_MAXLEN ];u8 ssidlen; -u8 go_bssid[ETH_ALEN ]; -u8 peer_macaddr[ETH_ALEN ]; +u8 go_bssid[ETH_ALEN ]; +u8 peer_macaddr[ETH_ALEN ];u8 operating_ch;/* This information will be set by using the * p2p_set op_ch=x */ u8 peer_ch;/* The listen channel for peer P2P device */
@@ -154,9 +154,9 @@ struct tx_nego_req_info { };struct group_id_info { -u8 go_device_addr[ETH_ALEN ];/* The GO's device address of +u8 go_device_addr[ETH_ALEN ];/* The GO's device address of * this P2P group */ -u8 ssid[WLAN_SSID_MAXLEN ];/* The SSID of this P2P group */ +u8 ssid[WLAN_SSID_MAXLEN ];/* The SSID of this P2P group */ };struct scan_limit_info {
@@ -459,7 +459,7 @@ static inline void set_fwstate(struct mlme_priv *pmlmepriv, int state) { pmlmepriv->fw_state |= state;/* FOR HW integration */ -if (_FW_UNDER_SURVEY==state) +if (_FW_UNDER_SURVEY == state) pmlmepriv->bScanInProcess = true; }
@@ -467,7 +467,7 @@ static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, int state) { pmlmepriv->fw_state &= ~state;/* FOR HW integration */ -if (_FW_UNDER_SURVEY==state) +if (_FW_UNDER_SURVEY == state) pmlmepriv->bScanInProcess = false; }
drivers/staging/r8188eu/include/rtw_mlme_ext.h +1 -1
@@ -729,7 +729,7 @@ enum rtw_c2h_event {GEN_EVT_CODE (_Survey),/*8*/ GEN_EVT_CODE (_SurveyDone),/*9*/ -GEN_EVT_CODE (_JoinBss) ,/*10*/ +GEN_EVT_CODE (_JoinBss),/*10*/ GEN_EVT_CODE (_AddSTA),GEN_EVT_CODE (_DelSTA), GEN_EVT_CODE(_AtimDone),
--
2.30.2
Re: [PATCH v3 05/10] staging: r8188eu: correct misspelled words in comments
In reply to Deepak R Varmadrivers/staging/r8188eu/core/rtw_ioctl_set.c u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, · line 290
Quoted 10 lines · Deepak R Varma
drivers/staging/r8188eu/core/rtw_ioctl_set.c +1
-1@@ -287,7 +287,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) {if (check_fwstate (pmlmepriv, _FW_LINKED)) -rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have chked whether issue dis-assoc_cmd or not */ +rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have cheked whether issue dis-assoc_cmd or not */
s/cheked/checked/
drivers/staging/r8188eu/core/rtw_ioctl_set.c u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, · line 293
Quoted 3 lines
drivers/staging/r8188eu/core/rtw_ioctl_set.c +0
-0} *pold_state = networktype;
regards,
dan carpenter
Re: [PATCH v3 05/10] staging: r8188eu: correct misspelled words in comments
Quoted 7 lines · Dan Carpenter
Quoted 6 lines · Deepak R Varma
drivers/staging/r8188eu/core/rtw_ioctl_set.c +0
-0@@ -287,7 +287,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,
Quoted 7 lines
drivers/staging/r8188eu/core/rtw_ioctl_set.c u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, · line 290
Quoted 4 lines
drivers/staging/r8188eu/core/rtw_ioctl_set.c +1
-1if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) {if (check_fwstate (pmlmepriv, _FW_LINKED)) -rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have chked whether issue dis-assoc_cmd or not */ +rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have cheked whether issue dis-assoc_cmd or not */ s/cheked/checked/
ahhh... That's insane. I must have overlooked the code-spell indication. Thank you for catching it Dan. I will wait for feedback on other patches and accordingly send in the revised version.
./drv
Quoted 7 lines
drivers/staging/r8188eu/core/rtw_ioctl_set.c u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, · line 293
Quoted 4 lines
drivers/staging/r8188eu/core/rtw_ioctl_set.c +0
-0} *pold_state = networktype;regards,
dan carpenter
Re: [PATCH v3 05/10] staging: r8188eu: correct misspelled words in comments
In reply to Dan CarpenterQuoted 7 lines · Dan Carpenter
Quoted 6 lines · Deepak R Varma
drivers/staging/r8188eu/core/rtw_ioctl_set.c +0
-0@@ -287,7 +287,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,
Quoted 7 lines
drivers/staging/r8188eu/core/rtw_ioctl_set.c u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, · line 290
Quoted 4 lines
drivers/staging/r8188eu/core/rtw_ioctl_set.c +1
-1if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) {if (check_fwstate (pmlmepriv, _FW_LINKED)) -rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have chked whether issue dis-assoc_cmd or not */ +rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have cheked whether issue dis-assoc_cmd or not */ s/cheked/checked/
There is also a strange double space before issue.
julia
Quoted 9 lines
drivers/staging/r8188eu/core/rtw_ioctl_set.c u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, · line 293
Quoted 4 lines
drivers/staging/r8188eu/core/rtw_ioctl_set.c +0
-0} *pold_state = networktype;regards,
dan carpenter
Re: [PATCH v3 06/10] staging: r8188eu: Add space between function & macro parameters
In reply to Deepak R VarmaQuoted 59 lines · Deepak R Varma
Space required between function and macro parameters to improve code readability. This Linux kernel coding style guideline resolves following error reported by checkpatch script:
ERROR: space required after that ',' (ctx:VxV)Signed-off-by Deepak R Varma <[email protected]>---
Changes in v3:
1. Patch newly added to the patch set..../staging/r8188eu/include/osdep_service.h | 4 +-- .../staging/r8188eu/include/rtl8188e_hal.h | 2 +- drivers/staging/r8188eu/include/rtw_cmd.h | 4 +-- drivers/staging/r8188eu/include/rtw_io.h | 28 +++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-)drivers/staging/r8188eu/include/osdep_service.h +2
-2@@ -53,7 +53,7 @@ static inline struct list_head *get_list_head(struct __queue *queue)return (&(queue->queue)); } -static inline void _set_timer (struct timer_list *ptimer,u32 delay_time) +static inline void _set_timer (struct timer_list *ptimer,u32 delay_time) {mod_timer (ptimer, jiffies +msecs_to_jiffies (delay_time)); }@@ -108,7 +108,7 @@ void rtw_free_netdev(struct net_device *netdev);#define FUNC_ADPT_FMT "%s(%s)"#define FUNC_ADPT_ARG (adapter) __func__, adapter->pnetdev->name -#define rtw_signal_process (pid, sig) kill_pid(find_vpid((pid)),(sig), 1) +#define rtw_signal_process (pid, sig) kill_pid(find_vpid((pid)), (sig), 1)/* Macros for handling unaligned memory accesses */ drivers/staging/r8188eu/include/rtl8188e_hal.h +1
-1@@ -165,7 +165,7 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *hwinfo,void rtl8188e_EfuseParseChnlPlan (struct adapter *padapter,u8 *hwinfo,bool AutoLoadFail); -void Hal_ReadAntennaDiversity88E (struct adapter *pAdapter,u8 *PROMContent, +void Hal_ReadAntennaDiversity88E (struct adapter *pAdapter,u8 *PROMContent,bool AutoLoadFail);void Hal_ReadThermalMeter_88E (struct adapter * dapter,u8 *PROMContent,bool AutoloadFail);drivers/staging/r8188eu/include/rtw_cmd.h +0
-0
drivers/staging/r8188eu/include/rtw_cmd.h u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra n · line 745
Quoted 7 lines
drivers/staging/r8188eu/include/rtw_cmd.h +1
-1@@ -740,7 +740,7 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra nu8 rtw_setdatarate_cmd (struct adapter *padapter,u8 *rateset);u8 rtw_setrfintfs_cmd (struct adapter *padapter,u8 mode); -u8 rtw_gettssi_cmd (struct adapter *padapter,u8 offset,u8 *pval); +u8 rtw_gettssi_cmd (struct adapter *padapter,u8 offset,u8 *pval);u8 rtw_setfwdig_cmd (struct adapter *padapter,u8 type);u8 rtw_setfwra_cmd (struct adapter *padapter,u8 type);
Strange double space.
drivers/staging/r8188eu/include/rtw_cmd.h u8 rtw_dynamic_chk_wk_cmd(struct adapter *adapter); · line 754
Quoted 7 lines
drivers/staging/r8188eu/include/rtw_cmd.h +1
-1@@ -751,7 +751,7 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *adapter);u8 rtw_lps_ctrl_wk_cmd (struct adapter *padapter,u8 lps_ctrl_type,u8 enqueue);u8 rtw_rpt_timer_cfg_cmd (struct adapter *padapter,u16 minRptTime); -u8 rtw_antenna_select_cmd (struct adapter *padapter,u8 antenna,u8 enqueue); +u8 rtw_antenna_select_cmd (struct adapter *padapter,u8 antenna,u8 enqueue);
Missing space before *.
Quoted 36 lines
drivers/staging/r8188eu/include/rtw_cmd.h +0
-0u8 rtw_ps_cmd (struct adapter *padapter);u8 rtw_chk_hi_queue_cmd (struct adapter *padapter);drivers/staging/r8188eu/include/rtw_io.h +4
-14@@ -209,7 +209,7 @@ struct io_priv { };uint ioreq_flush (struct adapter *adapter,struct io_queue *ioqueue); -void sync_ioreq_enqueue (struct io_req *preq,struct io_queue *ioqueue); +void sync_ioreq_enqueue (struct io_req *preq,struct io_queue *ioqueue);uint sync_ioreq_flush (struct adapter *adapter,struct io_queue *ioqueue);uint free_ioreq (struct io_req *preq,struct io_queue *pio_queue);struct io_req *alloc_ioreq (struct io_queue *pio_q);@@ -285,18 +285,18 @@ void bus_sync_io(struct io_queue *pio_q);u32 _ioreq2rwmem (struct io_queue *pio_q);void dev_power_down (struct adapter *Adapter,u8 bpwrup); -#define PlatformEFIOWrite1Byte (_a,_b,_c) \ - rtw_write8(_a,_b,_c) -#define PlatformEFIOWrite2Byte (_a,_b,_c) \ - rtw_write16(_a,_b,_c) -#define PlatformEFIOWrite4Byte (_a,_b,_c) \ - rtw_write32(_a,_b,_c) - -#define PlatformEFIORead1Byte (_a,_b) \ - rtw_read8(_a,_b) -#define PlatformEFIORead2Byte (_a,_b) \ - rtw_read16(_a,_b) -#define PlatformEFIORead4Byte (_a,_b) \ - rtw_read32(_a,_b) +#define PlatformEFIOWrite1Byte (_a, _b, _c) \ + rtw_write8(_a, _b, _c) +#define PlatformEFIOWrite2Byte (_a, _b, _c) \
drivers/staging/r8188eu/include/rtw_io.h void bus_sync_io(struct io_queue *pio_q); · line 300
Quoted 10 lines
drivers/staging/r8188eu/include/rtw_io.h +10
-0+ rtw_write16(_a, _b, _c) +#define PlatformEFIOWrite4Byte (_a, _b, _c) \ + rtw_write32(_a, _b, _c) + +#define PlatformEFIORead1Byte (_a, _b) \ + rtw_read8(_a, _b) +#define PlatformEFIORead2Byte (_a, _b) \ + rtw_read16(_a, _b) +#define PlatformEFIORead4Byte (_a, _b) \ + rtw_read32(_a, _b)
Could these be inline functions?
julia
Re: [PATCH v3 05/10] staging: r8188eu: correct misspelled words in comments
In reply to Julia LawallQuoted 19 lines · Julia Lawall
Quoted 7 lines · Dan Carpenter
Quoted 6 lines · Deepak R Varma
drivers/staging/r8188eu/core/rtw_ioctl_set.c +0
-0@@ -287,7 +287,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,Quoted 7 lines
drivers/staging/r8188eu/core/rtw_ioctl_set.c u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, · line 290
Quoted 4 lines
drivers/staging/r8188eu/core/rtw_ioctl_set.c +1
-1if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) {if (check_fwstate (pmlmepriv, _FW_LINKED)) -rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have chked whether issue dis-assoc_cmd or not */ +rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have cheked whether issue dis-assoc_cmd or not */ s/cheked/checked/
Quoted 1 line
There is also a strange double space before issue.
Thanks. "While in there..." opportunity on revision :)
Quoted 13 lines
julia
Quoted 9 lines
drivers/staging/r8188eu/core/rtw_ioctl_set.c u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, · line 293
Quoted 4 lines
drivers/staging/r8188eu/core/rtw_ioctl_set.c +0
-0} *pold_state = networktype;regards,
dan carpenter
Re: [PATCH v3 05/10] staging: r8188eu: correct misspelled words in comments
In reply to Deepak R VarmaQuoted 2 lines · Deepak R Varma
Incorrectly spelled words should be corrected as per the Linux coding-style guidelines.
This seems a bit verbose. I think that spelling mistakes should just be fixed, and the need for fixes shouldn't have to rely on style guidelines.
Fix spelling mistakes in code comments across the driver.
drivers/staging/r8188eu/core/rtw_mlme_ext.c int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, · line 4618
Quoted 6 lines
drivers/staging/r8188eu/core/rtw_mlme_ext.c +1
-1@@ -4615,7 +4615,7 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid,return ret; } -/* if psta == NULL, indiate we are station(client) now... */ +/* if psta == NULL, indicate we are station(client) now... */
Does station plat the role of a function call? If (client) is just giving some extra information there should eb a space before the (.
drivers/staging/r8188eu/core/rtw_mlme_ext.c void issue_assocreq(struct adapter *padapter) · line 5017
Quoted 9 lines
drivers/staging/r8188eu/core/rtw_mlme_ext.c +1
-1void issue_auth (struct adapter *padapter,struct sta_info *psta,unsigned short status) {struct xmit_frame *pmgntframe;@@ -5014,7 +5014,7 @@ void issue_assocreq(struct adapter *padapter)if (!padapter->registrypriv.wifi_spec) {/* Commented by Kurt 20110629 */ /* In some older APs, WPS handshake */ -/* would be fail if we append vender extensions informations to AP */ +/* would be fail if we append vender extensions information to AP */
envder -> vendor
extensions -> extension
drivers/staging/r8188eu/core/rtw_mlme_ext.c static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 · line 5347
Quoted 6 lines
drivers/staging/r8188eu/core/rtw_mlme_ext.c +1
-1@@ -5344,7 +5344,7 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16return ret; } -/* when wait_ms > 0 , this function shoule be called at process context */ +/* when wait_ms > 0 , this function should be called at process context */
Unnecessary space before the comma.
drivers/staging/r8188eu/core/rtw_mlme_ext.c void site_survey(struct adapter *padapter) · line 6061
Quoted 6 lines
drivers/staging/r8188eu/core/rtw_mlme_ext.c +1
-1@@ -6058,7 +6058,7 @@ void site_survey(struct adapter *padapter) }else {/* 20100721:Interrupt scan operation here. */ /* For SW antenna diversity before link, it needs to switch to another antenna and scan again. */ -/* It compares the scan result and select beter one to do connection. */ +/* It compares the scan result and select better one to do connection. */
select -> selects a
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c void rtl8188e_PHY_SetBBReg(struct adapter *Adapter, u32 RegAddr, u32 BitMask, u3 · line 97
Quoted 7 lines
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +2
-1+++ b/drivers/staging/r8188eu/hal/rtl8188e_phycfg.c@@ -94,7 +94,7 @@ void rtl8188e_PHY_SetBBReg(struct adapter *Adapter, u32 RegAddr, u32 BitMask, u3/** * Function: phy_RFSerialRead * -* OverView: Read regster from RF chips +* OverView: Read register from RF chips
Not sure why View is capitalized.
julia
Re: [PATCH v3 06/10] staging: r8188eu: Add space between function & macro parameters
In reply to Julia LawallQuoted 17 lines · Julia Lawall
Quoted 13 lines · Deepak R Varma
Space required between function and macro parameters to improve code readability. This Linux kernel coding style guideline resolves following error reported by checkpatch script:
ERROR: space required after that ',' (ctx:VxV)Signed-off-by Deepak R Varma <[email protected]>---
Changes in v3:
1. Patch newly added to the patch set.
Quoted 6 lines
drivers/staging/r8188eu/include/rtw_cmd.h u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra n · line 745
Quoted 4 lines
drivers/staging/r8188eu/include/rtw_cmd.h +1
-1-u8 rtw_gettssi_cmd (struct adapter *padapter,u8 offset,u8 *pval); +u8 rtw_gettssi_cmd (struct adapter *padapter,u8 offset,u8 *pval);u8 rtw_setfwdig_cmd (struct adapter *padapter,u8 type);u8 rtw_setfwra_cmd (struct adapter *padapter,u8 type);Strange double space.
Agreed, made a note.
Quoted 10 lines
drivers/staging/r8188eu/include/rtw_cmd.h u8 rtw_dynamic_chk_wk_cmd(struct adapter *adapter); · line 754
Quoted 8 lines
drivers/staging/r8188eu/include/rtw_cmd.h +1
-1@@ -751,7 +751,7 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *adapter);u8 rtw_lps_ctrl_wk_cmd (struct adapter *padapter,u8 lps_ctrl_type,u8 enqueue);u8 rtw_rpt_timer_cfg_cmd (struct adapter *padapter,u16 minRptTime); -u8 rtw_antenna_select_cmd (struct adapter *padapter,u8 antenna,u8 enqueue); +u8 rtw_antenna_select_cmd (struct adapter *padapter,u8 antenna,u8 enqueue);Missing space before *.
Agreed, made a note.
Quoted 30 lines
Quoted 30 lines
drivers/staging/r8188eu/include/rtw_cmd.h +0
-0u8 rtw_ps_cmd (struct adapter *padapter);drivers/staging/r8188eu/include/rtw_io.h +7
-13@@ -209,7 +209,7 @@ struct io_priv { }; -#define PlatformEFIOWrite1Byte (_a,_b,_c) \ - rtw_write8(_a,_b,_c) -#define PlatformEFIOWrite2Byte (_a,_b,_c) \ - rtw_write16(_a,_b,_c) -#define PlatformEFIOWrite4Byte (_a,_b,_c) \ - rtw_write32(_a,_b,_c) - -#define PlatformEFIORead1Byte (_a,_b) \ - rtw_read8(_a,_b) -#define PlatformEFIORead2Byte (_a,_b) \ - rtw_read16(_a,_b) -#define PlatformEFIORead4Byte (_a,_b) \ - rtw_read32(_a,_b) +#define PlatformEFIOWrite1Byte (_a, _b, _c) \ + rtw_write8(_a, _b, _c) +#define PlatformEFIOWrite2Byte (_a, _b, _c) \ + rtw_write16(_a, _b, _c) +#define PlatformEFIOWrite4Byte (_a, _b, _c) \ + rtw_write32(_a, _b, _c) +
Quoted 8 lines
drivers/staging/r8188eu/include/rtw_io.h void bus_sync_io(struct io_queue *pio_q); · line 300
Quoted 6 lines
drivers/staging/r8188eu/include/rtw_io.h +6
-0+#define PlatformEFIORead1Byte (_a, _b) \ + rtw_read8(_a, _b) +#define PlatformEFIORead2Byte (_a, _b) \ + rtw_read16(_a, _b) +#define PlatformEFIORead4Byte (_a, _b) \ + rtw_read32(_a, _b)Could these be inline functions?
I am actually not seeing these macros being used anywhere. These macros were added recently [commit ID: 7884fc0a1473c2721f496f1d1ddc9d2c91aefa53] in 2021. I am unsure if they are intended to be used in the future or can removed entirely.
Making these inline functions can be done, however, will we need to measure performance impact? I will need help and time for this evaluation.
Let me know what you think is right thing to do here.
Thank you,
./drv
Quoted 2 lines
julia
Re: [PATCH v3 06/10] staging: r8188eu: Add space between function & macro parameters
Quoted 29 lines
Quoted 20 lines
Quoted 20 lines
drivers/staging/r8188eu/include/rtw_io.h +7
-13-#define PlatformEFIOWrite1Byte (_a,_b,_c) \ - rtw_write8(_a,_b,_c) -#define PlatformEFIOWrite2Byte (_a,_b,_c) \ - rtw_write16(_a,_b,_c) -#define PlatformEFIOWrite4Byte (_a,_b,_c) \ - rtw_write32(_a,_b,_c) - -#define PlatformEFIORead1Byte (_a,_b) \ - rtw_read8(_a,_b) -#define PlatformEFIORead2Byte (_a,_b) \ - rtw_read16(_a,_b) -#define PlatformEFIORead4Byte (_a,_b) \ - rtw_read32(_a,_b) +#define PlatformEFIOWrite1Byte (_a, _b, _c) \ + rtw_write8(_a, _b, _c) +#define PlatformEFIOWrite2Byte (_a, _b, _c) \ + rtw_write16(_a, _b, _c) +#define PlatformEFIOWrite4Byte (_a, _b, _c) \ + rtw_write32(_a, _b, _c) +Quoted 8 lines
drivers/staging/r8188eu/include/rtw_io.h void bus_sync_io(struct io_queue *pio_q); · line 300
Quoted 6 lines
drivers/staging/r8188eu/include/rtw_io.h +6
-0+#define PlatformEFIORead1Byte (_a, _b) \ + rtw_read8(_a, _b) +#define PlatformEFIORead2Byte (_a, _b) \ + rtw_read16(_a, _b) +#define PlatformEFIORead4Byte (_a, _b) \ + rtw_read32(_a, _b)Could these be inline functions?
Quoted 6 lines
I am actually not seeing these macros being used anywhere. These macros were added recently [commit ID:
7884fc0a1473c2721f496f1d1ddc9d2c91aefa53] in 2021. I am unsure if they are intended to be used in the future or can removed entirely.Making these inline functions can be done, however, will we need to measure performance impact? I will need help and time for this evaluation.
Inline functions shouldn't have any performance impact. For these simple things the compiler should inline them.
The reason why a macro may be needed is if it is not possible to find a single type for all of the possible argument values, or if some argument values are assigned to by the macro definition, and not just read.
I would have suggested to look at all of the uses to see if there are any concerns like this, but if there aren't any uses, that won't be possible. There seems to be no special knowledge in these macros that is worth preserving, so I think that they can just be dropped.
julia
Re: [PATCH v3 06/10] staging: r8188eu: Add space between function & macro parameters
Quoted 33 lines · Julia Lawall
Quoted 33 lines
Quoted 20 lines
Quoted 20 lines
drivers/staging/r8188eu/include/rtw_io.h +7
-13-#define PlatformEFIOWrite1Byte (_a,_b,_c) \ - rtw_write8(_a,_b,_c) -#define PlatformEFIOWrite2Byte (_a,_b,_c) \ - rtw_write16(_a,_b,_c) -#define PlatformEFIOWrite4Byte (_a,_b,_c) \ - rtw_write32(_a,_b,_c) - -#define PlatformEFIORead1Byte (_a,_b) \ - rtw_read8(_a,_b) -#define PlatformEFIORead2Byte (_a,_b) \ - rtw_read16(_a,_b) -#define PlatformEFIORead4Byte (_a,_b) \ - rtw_read32(_a,_b) +#define PlatformEFIOWrite1Byte (_a, _b, _c) \ + rtw_write8(_a, _b, _c) +#define PlatformEFIOWrite2Byte (_a, _b, _c) \ + rtw_write16(_a, _b, _c) +#define PlatformEFIOWrite4Byte (_a, _b, _c) \ + rtw_write32(_a, _b, _c) +Quoted 8 lines
drivers/staging/r8188eu/include/rtw_io.h void bus_sync_io(struct io_queue *pio_q); · line 300
Quoted 6 lines
drivers/staging/r8188eu/include/rtw_io.h +6
-0+#define PlatformEFIORead1Byte (_a, _b) \ + rtw_read8(_a, _b) +#define PlatformEFIORead2Byte (_a, _b) \ + rtw_read16(_a, _b) +#define PlatformEFIORead4Byte (_a, _b) \ + rtw_read32(_a, _b)Could these be inline functions?
I am actually not seeing these macros being used anywhere. These macros were added recently [commit ID:
7884fc0a1473c2721f496f1d1ddc9d2c91aefa53] in 2021. I am unsure if they are intended to be used in the future or can removed entirely.
Quoted 5 lines
Quoted 2 lines
Making these inline functions can be done, however, will we need to measure performance impact? I will need help and time for this evaluation.
Inline functions shouldn't have any performance impact. For these simple things the compiler should inline them.
Understood. For these simple cases, it should not.
Quoted 4 lines
The reason why a macro may be needed is if it is not possible to find a single type for all of the possible argument values, or if some argument values are assigned to by the macro definition, and not just read.
Okay. This is helpful. Thank you.
Quoted 5 lines
I would have suggested to look at all of the uses to see if there are any concerns like this, but if there aren't any uses, that won't be possible. There seems to be no special knowledge in these macros that is worth preserving, so I think that they can just be dropped.
Sounds good. I will drop them in the revision.
Thank you Julia.
./drv
Quoted 3 lines
julia
Greg KH
maintainerRe: [PATCH v3 01/10] staging: r8188eu: use Linux kernel variable naming convention
In reply to Deepak R VarmaQuoted 46 lines · Deepak R Varma
Follow the Linux Kernel coding style variable naming convention instead of using camelCase style. Issue reported by checkpatch script for these variables:
tagLen, tagType, networkAddr, ipAddr, macAddrSigned-off-by Deepak R Varma <[email protected]>---
Changes in v3:
-- NoneChanges in v1 [actually v2]:
1. Improve patch description per feedback from [email protected]drivers/staging/r8188eu/core/rtw_br_ext.c | 112 +++++++++++----------- 1 file changed, 56 insertions(+), 56 deletions(-)drivers/staging/r8188eu/core/rtw_br_ext.c +5
-5@@ -50,17 +50,17 @@static unsigned char *__nat25_find_pppoe_tag (struct pppoe_hdr *ph,unsigned short type) {unsigned char *cur_ptr, *start_ptr; -unsigned short tagLen, tagType; +unsigned short tag_len, tag_type; start_ptr = (unsigned char *)ph->tag; cur_ptr = (unsigned char *)ph->tag;while ((cur_ptr - start_ptr) <ntohs (ph->length)) {/* prevent un-alignment access */ - tagType = (unsigned short )((cur_ptr[0 ] <<8 ) + cur_ptr[1 ]); - tagLen = (unsigned short )((cur_ptr[2 ] <<8 ) + cur_ptr[3 ]); -if (tagType == type) + tag_type = (unsigned short )((cur_ptr[0 ] <<8 ) + cur_ptr[1 ]); + tag_len = (unsigned short )((cur_ptr[2 ] <<8 ) + cur_ptr[3 ]); +if (tag_type == type)return cur_ptr; - cur_ptr = cur_ptr +TAG_HDR_LEN + tagLen; + cur_ptr = cur_ptr +TAG_HDR_LEN + tag_len; }return NULL ; }
drivers/staging/r8188eu/core/rtw_br_ext.c static int __nat25_has_expired(struct nat25_network_db_entry *fdb) · line 114
Quoted 4 lines
drivers/staging/r8188eu/core/rtw_br_ext.c +0
-1@@ -111,32 +111,32 @@ static int __nat25_has_expired(struct nat25_network_db_entry *fdb)return 0 ; } -static void __nat25_generate_ipv4_network_addr(unsigned char *networkAddr,
As others have said, just make "networkAddr" be "addr" and then it will be a lot cleaner and smaller overall.
thanks,
greg k-h
Re: [PATCH v3 01/10] staging: r8188eu: use Linux kernel variable naming convention
Quoted 50 lines · Greg KH
Quoted 49 lines · Deepak R Varma
Follow the Linux Kernel coding style variable naming convention instead of using camelCase style. Issue reported by checkpatch script for these variables:
tagLen, tagType, networkAddr, ipAddr, macAddrSigned-off-by Deepak R Varma <[email protected]>---
Changes in v3:
-- NoneChanges in v1 [actually v2]:
1. Improve patch description per feedback from [email protected]drivers/staging/r8188eu/core/rtw_br_ext.c | 112 +++++++++++----------- 1 file changed, 56 insertions(+), 56 deletions(-)drivers/staging/r8188eu/core/rtw_br_ext.c +5
-5@@ -50,17 +50,17 @@static unsigned char *__nat25_find_pppoe_tag (struct pppoe_hdr *ph,unsigned short type) {unsigned char *cur_ptr, *start_ptr; -unsigned short tagLen, tagType; +unsigned short tag_len, tag_type; start_ptr = (unsigned char *)ph->tag; cur_ptr = (unsigned char *)ph->tag;while ((cur_ptr - start_ptr) <ntohs (ph->length)) {/* prevent un-alignment access */ - tagType = (unsigned short )((cur_ptr[0 ] <<8 ) + cur_ptr[1 ]); - tagLen = (unsigned short )((cur_ptr[2 ] <<8 ) + cur_ptr[3 ]); -if (tagType == type) + tag_type = (unsigned short )((cur_ptr[0 ] <<8 ) + cur_ptr[1 ]); + tag_len = (unsigned short )((cur_ptr[2 ] <<8 ) + cur_ptr[3 ]); +if (tag_type == type)return cur_ptr; - cur_ptr = cur_ptr +TAG_HDR_LEN + tagLen; + cur_ptr = cur_ptr +TAG_HDR_LEN + tag_len; }return NULL ; }@@ -111,32 +111,32 @@ static int __nat25_has_expired(struct nat25_network_db_entry *fdb)return 0 ; }
Quoted 4 lines
drivers/staging/r8188eu/core/rtw_br_ext.c static int __nat25_has_expired(struct nat25_network_db_entry *fdb) · line 114
Quoted 1 line
drivers/staging/r8188eu/core/rtw_br_ext.c +0
-1-static void __nat25_generate_ipv4_network_addr(unsigned char *networkAddr,As others have said, just make "networkAddr" be "addr" and then it will be a lot cleaner and smaller overall.
Sounds good. Noted for next revision.
Thank you.
./drv
Quoted 4 lines
thanks,
greg k-h
Re: [PATCH v3 06/10] staging: r8188eu: Add space between function & macro parameters
In reply to Julia LawallQuoted 66 lines · Julia Lawall
Quoted 62 lines · Deepak R Varma
Space required between function and macro parameters to improve code readability. This Linux kernel coding style guideline resolves following error reported by checkpatch script:
ERROR: space required after that ',' (ctx:VxV)Signed-off-by Deepak R Varma <[email protected]>---
Changes in v3:
1. Patch newly added to the patch set..../staging/r8188eu/include/osdep_service.h | 4 +-- .../staging/r8188eu/include/rtl8188e_hal.h | 2 +- drivers/staging/r8188eu/include/rtw_cmd.h | 4 +-- drivers/staging/r8188eu/include/rtw_io.h | 28 +++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-)drivers/staging/r8188eu/include/osdep_service.h +2
-2@@ -53,7 +53,7 @@ static inline struct list_head *get_list_head(struct __queue *queue)return (&(queue->queue)); } -static inline void _set_timer (struct timer_list *ptimer,u32 delay_time) +static inline void _set_timer (struct timer_list *ptimer,u32 delay_time) {mod_timer (ptimer, jiffies +msecs_to_jiffies (delay_time)); }@@ -108,7 +108,7 @@ void rtw_free_netdev(struct net_device *netdev);#define FUNC_ADPT_FMT "%s(%s)"#define FUNC_ADPT_ARG (adapter) __func__, adapter->pnetdev->name -#define rtw_signal_process (pid, sig) kill_pid(find_vpid((pid)),(sig), 1) +#define rtw_signal_process (pid, sig) kill_pid(find_vpid((pid)), (sig), 1)/* Macros for handling unaligned memory accesses */ drivers/staging/r8188eu/include/rtl8188e_hal.h +1
-1@@ -165,7 +165,7 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *hwinfo,void rtl8188e_EfuseParseChnlPlan (struct adapter *padapter,u8 *hwinfo,bool AutoLoadFail); -void Hal_ReadAntennaDiversity88E (struct adapter *pAdapter,u8 *PROMContent, +void Hal_ReadAntennaDiversity88E (struct adapter *pAdapter,u8 *PROMContent,bool AutoLoadFail);void Hal_ReadThermalMeter_88E (struct adapter * dapter,u8 *PROMContent,bool AutoloadFail);drivers/staging/r8188eu/include/rtw_cmd.h +0
-0@@ -740,7 +740,7 @@ u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra nu8 rtw_setdatarate_cmd (struct adapter *padapter,u8 *rateset);u8 rtw_setrfintfs_cmd (struct adapter *padapter,u8 mode);
Quoted 6 lines
drivers/staging/r8188eu/include/rtw_cmd.h u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_infra n · line 745
Quoted 4 lines
drivers/staging/r8188eu/include/rtw_cmd.h +1
-1-u8 rtw_gettssi_cmd (struct adapter *padapter,u8 offset,u8 *pval); +u8 rtw_gettssi_cmd (struct adapter *padapter,u8 offset,u8 *pval);u8 rtw_setfwdig_cmd (struct adapter *padapter,u8 type);u8 rtw_setfwra_cmd (struct adapter *padapter,u8 type);Strange double space.
Yes, noted.
Quoted 10 lines
drivers/staging/r8188eu/include/rtw_cmd.h u8 rtw_dynamic_chk_wk_cmd(struct adapter *adapter); · line 754
Quoted 8 lines
drivers/staging/r8188eu/include/rtw_cmd.h +1
-1@@ -751,7 +751,7 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *adapter);u8 rtw_lps_ctrl_wk_cmd (struct adapter *padapter,u8 lps_ctrl_type,u8 enqueue);u8 rtw_rpt_timer_cfg_cmd (struct adapter *padapter,u16 minRptTime); -u8 rtw_antenna_select_cmd (struct adapter *padapter,u8 antenna,u8 enqueue); +u8 rtw_antenna_select_cmd (struct adapter *padapter,u8 antenna,u8 enqueue);Missing space before *.
Addressed in following patch since that is a different kind of issue to fix.
Quoted 51 lines
Quoted 37 lines
drivers/staging/r8188eu/include/rtw_cmd.h +0
-0u8 rtw_ps_cmd (struct adapter *padapter);u8 rtw_chk_hi_queue_cmd (struct adapter *padapter);drivers/staging/r8188eu/include/rtw_io.h +4
-14@@ -209,7 +209,7 @@ struct io_priv { };uint ioreq_flush (struct adapter *adapter,struct io_queue *ioqueue); -void sync_ioreq_enqueue (struct io_req *preq,struct io_queue *ioqueue); +void sync_ioreq_enqueue (struct io_req *preq,struct io_queue *ioqueue);uint sync_ioreq_flush (struct adapter *adapter,struct io_queue *ioqueue);uint free_ioreq (struct io_req *preq,struct io_queue *pio_queue);struct io_req *alloc_ioreq (struct io_queue *pio_q);@@ -285,18 +285,18 @@ void bus_sync_io(struct io_queue *pio_q);u32 _ioreq2rwmem (struct io_queue *pio_q);void dev_power_down (struct adapter *Adapter,u8 bpwrup); -#define PlatformEFIOWrite1Byte (_a,_b,_c) \ - rtw_write8(_a,_b,_c) -#define PlatformEFIOWrite2Byte (_a,_b,_c) \ - rtw_write16(_a,_b,_c) -#define PlatformEFIOWrite4Byte (_a,_b,_c) \ - rtw_write32(_a,_b,_c) - -#define PlatformEFIORead1Byte (_a,_b) \ - rtw_read8(_a,_b) -#define PlatformEFIORead2Byte (_a,_b) \ - rtw_read16(_a,_b) -#define PlatformEFIORead4Byte (_a,_b) \ - rtw_read32(_a,_b) +#define PlatformEFIOWrite1Byte (_a, _b, _c) \ + rtw_write8(_a, _b, _c) +#define PlatformEFIOWrite2Byte (_a, _b, _c) \drivers/staging/r8188eu/include/rtw_io.h void bus_sync_io(struct io_queue *pio_q); · line 300
Quoted 10 lines
drivers/staging/r8188eu/include/rtw_io.h +10
-0+ rtw_write16(_a, _b, _c) +#define PlatformEFIOWrite4Byte (_a, _b, _c) \ + rtw_write32(_a, _b, _c) + +#define PlatformEFIORead1Byte (_a, _b) \ + rtw_read8(_a, _b) +#define PlatformEFIORead2Byte (_a, _b) \ + rtw_read16(_a, _b) +#define PlatformEFIORead4Byte (_a, _b) \ + rtw_read32(_a, _b)Could these be inline functions?
julia