Skip to contentSkip to conversation

staging: rtl8723bs: os_dep: Remove commented code lines, correct longline comments, remove whitespace in code

PATCH In review R Veera Kumar 2 participants 9 messages Mar 21, 2020 Staging

lore
Share & tools
lore
#0 lore raw

v3 cover staging: rtl8723bs: os_dep: Remove commented code lines, correct longline comments, remove whitespace in code

Patch 1:

Remove multiple commented out code lines.
Remove blank lines next to them.

Patch 2:

Correct long line comments to match coding style of respecting 80 character per line limit.

Patch 3:
Remove four leading whitespace characters in code line.

Please apply the patches in series.

Changes since V2:
- Remove commented code lines
- Drop a code line with correct leading whitespace
Changes since V1:
- Missed staging: rtl8723bs: os_dep: in cover letter
---
R Veera Kumar (3):
staging: rtl8723bs: os_dep: Remove commented out code lines
staging: rtl8723bs: os_dep: Correct long line comments
staging: rtl8723bs: os_dep: Remove whitespace characters in code line

 drivers/staging/rtl8723bs/os_dep/recv_linux.c | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH v3 1/3 staging: rtl8723bs: os_dep: Remove commented out code lines

Remove multiple commented out code lines.
Remove blank lines next to them.

---
 drivers/staging/rtl8723bs/os_dep/recv_linux.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/staging/rtl8723bs/os_dep/recv_linux.c +0 -11
index a6491f163272..271b680e4388 100644
@@ -109,11 +109,7 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt
 			struct sta_priv *pstapriv = &padapter->stapriv;
 			int bmcast = IS_MCAST(pattrib->dst);
 
-			/* DBG_871X("bmcast =%d\n", bmcast); */
-
 			if (memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)) {
-				/* DBG_871X("not ap psta =%p, addr =%pM\n", psta, pattrib->dst); */
-
 				if (bmcast) {
 					psta = rtw_get_bcmc_stainfo(padapter);
 					pskb2 = rtw_skb_clone(pkt);
@@ -123,9 +119,6 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt
 
 				if (psta) {
 					struct net_device *pnetdev = (struct net_device*)padapter->pnetdev;
-
-					/* DBG_871X("directly forwarding to the rtw_xmit_entry\n"); */
-
 					/* skb->ip_summed = CHECKSUM_NONE; */
 					pkt->dev = pnetdev;
 					skb_set_queue_mapping(pkt, rtw_recv_select_queue(pkt));
@@ -234,14 +227,10 @@ static void rtw_os_ksocket_send(struct adapter *padapter, union recv_frame *prec
 		if (rx_pid == psta->pid) {
 			int i;
 			u16 len = *(u16*)(skb->data+ETH_HLEN+2);
-			/* u16 ctrl_type = *(u16*)(skb->data+ETH_HLEN+4); */
-
-			/* DBG_871X("eth, RC: len = 0x%x, ctrl_type = 0x%x\n", len, ctrl_type); */
 			DBG_871X("eth, RC: len = 0x%x\n", len);
 
 			for (i = 0; i < len; i++)
 				DBG_871X("0x%x\n", *(skb->data+ETH_HLEN+4+i));
-				/* DBG_871X("0x%x\n", *(skb->data+ETH_HLEN+6+i)); */
 
 			DBG_871X("eth, RC-end\n");
 		}
Signature · 1 line
2.20.1
#7 lore raw

PATCH v3 2/3 staging: rtl8723bs: os_dep: Correct long line comments

In reply to R Veera Kumar

Correct long line comments to respect 80 character per line limit.

---
Changes in v4:
- Drop commented out code lines as not longlines
Changes in v3:
- Remove extra ' ' character before comment
Changes in v2:
- Remove an extra blank line added by error

---
 drivers/staging/rtl8723bs/os_dep/recv_linux.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/os_dep/recv_linux.c +8 -3
index 271b680e4388..9e1b42852500 100644
@@ -35,7 +35,8 @@ void rtw_os_recv_resource_free(struct recv_priv *precvpriv)
 
 	for (i = 0; i < NR_RECVFRAME; i++) {
 		if (precvframe->u.hdr.pkt) {
-			dev_kfree_skb_any(precvframe->u.hdr.pkt);/* free skb by driver */
+			/* free skb by driver */
+			dev_kfree_skb_any(precvframe->u.hdr.pkt);
 			precvframe->u.hdr.pkt = NULL;
 		}
 		precvframe++;
@@ -80,7 +81,10 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8
 		((!memcmp(sub_skb->data, rtw_rfc1042_header, SNAP_SIZE) &&
 		  eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) ||
 		 !memcmp(sub_skb->data, rtw_bridge_tunnel_header, SNAP_SIZE))) {
-		/* remove RFC1042 or Bridge-Tunnel encapsulation and replace EtherType */
+		/*
+		 * remove RFC1042 or Bridge-Tunnel encapsulation and replace
+		 * EtherType
+		 */
 		skb_pull(sub_skb, SNAP_SIZE);
 		memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->src, ETH_ALEN);
 		memcpy(skb_push(sub_skb, ETH_ALEN), pattrib->dst, ETH_ALEN);
@@ -280,7 +284,8 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
 
 	rtw_os_recv_indicate_pkt(padapter, skb, pattrib);
 
-	precv_frame->u.hdr.pkt = NULL; /*  pointers to NULL before rtw_free_recvframe() */
+	/* pointers to NULL before rtw_free_recvframe() */
+	precv_frame->u.hdr.pkt = NULL;
 
 	rtw_free_recvframe(precv_frame, pfree_recv_queue);
 
Signature · 1 line
2.20.1
#8 lore raw

PATCH v3 3/3 staging: rtl8723bs: os_dep: Remove whitespace characters in code line

In reply to R Veera Kumar

Remove four leading whitespace characters in code line.

---
Changes in v2:
- Drop a code line with correct leading whitespace

---
 drivers/staging/rtl8723bs/os_dep/recv_linux.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/os_dep/recv_linux.c +4 -4
index 9e1b42852500..60c35d92ba29 100644
@@ -295,11 +295,11 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
 
 _recv_indicatepkt_drop:
 
-	 /* enqueue back to free_recv_queue */
-	 rtw_free_recvframe(precv_frame, pfree_recv_queue);
+	/* enqueue back to free_recv_queue */
+	rtw_free_recvframe(precv_frame, pfree_recv_queue);
 
-	 DBG_COUNTER(padapter->rx_logs.os_indicate_err);
-	 return _FAIL;
+	DBG_COUNTER(padapter->rx_logs.os_indicate_err);
+	return _FAIL;
 }
 
 void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl)
Signature · 1 line
2.20.1
#2 lore raw

Re: [Outreachy kernel] [PATCH v3 1/3] staging: rtl8723bs: os_dep: Remove commented out code lines

In reply to R Veera Kumar
Quoted 2 lines · R Veera Kumar

Remove multiple commented out code lines.
Remove blank lines next to them.

You don't have the change it, but mentioning removing the blank lines was not really necessary. It is normal that you should clean up the adjacent whitespace when you clean up the code.

julia

Quoted 55 lines
---
 drivers/staging/rtl8723bs/os_dep/recv_linux.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/staging/rtl8723bs/os_dep/recv_linux.c +0 -12
index a6491f163272..271b680e4388 100644
@@ -109,11 +109,7 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt
 			struct sta_priv *pstapriv = &padapter->stapriv;
 			int bmcast = IS_MCAST(pattrib->dst);
 
-			/* DBG_871X("bmcast =%d\n", bmcast); */
-
 			if (memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)) {
-				/* DBG_871X("not ap psta =%p, addr =%pM\n", psta, pattrib->dst); */
-
 				if (bmcast) {
 					psta = rtw_get_bcmc_stainfo(padapter);
 					pskb2 = rtw_skb_clone(pkt);
@@ -123,9 +119,6 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt
 
 				if (psta) {
 					struct net_device *pnetdev = (struct net_device*)padapter->pnetdev;
-
-					/* DBG_871X("directly forwarding to the rtw_xmit_entry\n"); */
-
 					/* skb->ip_summed = CHECKSUM_NONE; */
 					pkt->dev = pnetdev;
 					skb_set_queue_mapping(pkt, rtw_recv_select_queue(pkt));
@@ -234,14 +227,10 @@ static void rtw_os_ksocket_send(struct adapter *padapter, union recv_frame *prec
 		if (rx_pid == psta->pid) {
 			int i;
 			u16 len = *(u16*)(skb->data+ETH_HLEN+2);
-			/* u16 ctrl_type = *(u16*)(skb->data+ETH_HLEN+4); */
-
-			/* DBG_871X("eth, RC: len = 0x%x, ctrl_type = 0x%x\n", len, ctrl_type); */
 			DBG_871X("eth, RC: len = 0x%x\n", len);
 
 			for (i = 0; i < len; i++)
 				DBG_871X("0x%x\n", *(skb->data+ETH_HLEN+4+i));
-				/* DBG_871X("0x%x\n", *(skb->data+ETH_HLEN+6+i)); */
 
 			DBG_871X("eth, RC-end\n");
 		}
--

2.20.1

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/a62d2fbb77990210b939a5ec99ee27cfa5749a09.1584764104.git.vkor%40vkten.in.

#3 lore raw

Re: [Outreachy kernel] [PATCH v3 1/3] staging: rtl8723bs: os_dep: Remove commented out code lines

Quoted 11 lines · Julia Lawall
Quoted 2 lines · R Veera Kumar

Remove multiple commented out code lines.
Remove blank lines next to them.

You don't have the change it, but mentioning removing the blank lines was not really necessary. It is normal that you should clean up the adjacent whitespace when you clean up the code.

Sorry I can't make out: "You don't have the change it"

So I keep those commented lines or remove them.

But Greg said in comment to patch:
Again, this is not a long-line comment, it is a code line that is commented out. "Remove it in a patch previous to this one please."

Veera

Quoted 50 lines

julia

Quoted 48 lines
---
 drivers/staging/rtl8723bs/os_dep/recv_linux.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/staging/rtl8723bs/os_dep/recv_linux.c +0 -12
index a6491f163272..271b680e4388 100644
@@ -109,11 +109,7 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt
 			struct sta_priv *pstapriv = &padapter->stapriv;
 			int bmcast = IS_MCAST(pattrib->dst);
 
-			/* DBG_871X("bmcast =%d\n", bmcast); */
-
 			if (memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)) {
-				/* DBG_871X("not ap psta =%p, addr =%pM\n", psta, pattrib->dst); */
-
 				if (bmcast) {
 					psta = rtw_get_bcmc_stainfo(padapter);
 					pskb2 = rtw_skb_clone(pkt);
@@ -123,9 +119,6 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt
 
 				if (psta) {
 					struct net_device *pnetdev = (struct net_device*)padapter->pnetdev;
-
-					/* DBG_871X("directly forwarding to the rtw_xmit_entry\n"); */
-
 					/* skb->ip_summed = CHECKSUM_NONE; */
 					pkt->dev = pnetdev;
 					skb_set_queue_mapping(pkt, rtw_recv_select_queue(pkt));
@@ -234,14 +227,10 @@ static void rtw_os_ksocket_send(struct adapter *padapter, union recv_frame *prec
 		if (rx_pid == psta->pid) {
 			int i;
 			u16 len = *(u16*)(skb->data+ETH_HLEN+2);
-			/* u16 ctrl_type = *(u16*)(skb->data+ETH_HLEN+4); */
-
-			/* DBG_871X("eth, RC: len = 0x%x, ctrl_type = 0x%x\n", len, ctrl_type); */
 			DBG_871X("eth, RC: len = 0x%x\n", len);
 
 			for (i = 0; i < len; i++)
 				DBG_871X("0x%x\n", *(skb->data+ETH_HLEN+4+i));
-				/* DBG_871X("0x%x\n", *(skb->data+ETH_HLEN+6+i)); */
 
 			DBG_871X("eth, RC-end\n");
 		}
--
#4 lore raw

Re: [Outreachy kernel] [PATCH v3 1/3] staging: rtl8723bs: os_dep: Remove commented out code lines

Quoted 8 lines · R Veera Kumar
Quoted 7 lines · Julia Lawall
Quoted 2 lines · R Veera Kumar

Remove multiple commented out code lines.
Remove blank lines next to them.

Quoted 8 lines
Quoted 4 lines

You don't have the change it, but mentioning removing the blank lines was not really necessary. It is normal that you should clean up the adjacent whitespace when you clean up the code.

Sorry I can't make out: "You don't have the change it"

So I keep those commented lines or remove them.

I was commenting on your log message, not on your changes.

There was no need to include "Remove blank lines next to them." in the log message.

julia

Quoted 58 lines

But Greg said in comment to patch:
Again, this is not a long-line comment, it is a code line that is commented out. "Remove it in a patch previous to this one please."

Veera

Quoted 50 lines

julia

Quoted 48 lines
---
 drivers/staging/rtl8723bs/os_dep/recv_linux.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/staging/rtl8723bs/os_dep/recv_linux.c +0 -12
index a6491f163272..271b680e4388 100644
@@ -109,11 +109,7 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt
 			struct sta_priv *pstapriv = &padapter->stapriv;
 			int bmcast = IS_MCAST(pattrib->dst);
 
-			/* DBG_871X("bmcast =%d\n", bmcast); */
-
 			if (memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)) {
-				/* DBG_871X("not ap psta =%p, addr =%pM\n", psta, pattrib->dst); */
-
 				if (bmcast) {
 					psta = rtw_get_bcmc_stainfo(padapter);
 					pskb2 = rtw_skb_clone(pkt);
@@ -123,9 +119,6 @@ void rtw_os_recv_indicate_pkt(struct adapter *padapter, _pkt *pkt, struct rx_pkt
 
 				if (psta) {
 					struct net_device *pnetdev = (struct net_device*)padapter->pnetdev;
-
-					/* DBG_871X("directly forwarding to the rtw_xmit_entry\n"); */
-
 					/* skb->ip_summed = CHECKSUM_NONE; */
 					pkt->dev = pnetdev;
 					skb_set_queue_mapping(pkt, rtw_recv_select_queue(pkt));
@@ -234,14 +227,10 @@ static void rtw_os_ksocket_send(struct adapter *padapter, union recv_frame *prec
 		if (rx_pid == psta->pid) {
 			int i;
 			u16 len = *(u16*)(skb->data+ETH_HLEN+2);
-			/* u16 ctrl_type = *(u16*)(skb->data+ETH_HLEN+4); */
-
-			/* DBG_871X("eth, RC: len = 0x%x, ctrl_type = 0x%x\n", len, ctrl_type); */
 			DBG_871X("eth, RC: len = 0x%x\n", len);
 
 			for (i = 0; i < len; i++)
 				DBG_871X("0x%x\n", *(skb->data+ETH_HLEN+4+i));
-				/* DBG_871X("0x%x\n", *(skb->data+ETH_HLEN+6+i)); */
 
 			DBG_871X("eth, RC-end\n");
 		}
--
#5 lore raw

Re: [Outreachy kernel] [PATCH v3 1/3] staging: rtl8723bs: os_dep: Remove commented out code lines

Quoted 15 lines · Julia Lawall
Quoted 13 lines · R Veera Kumar
Quoted 11 lines · Julia Lawall
Quoted 2 lines · R Veera Kumar

Remove multiple commented out code lines.
Remove blank lines next to them.

You don't have the change it, but mentioning removing the blank lines was not really necessary. It is normal that you should clean up the adjacent whitespace when you clean up the code.

Quoted 9 lines
Quoted 3 lines

Sorry I can't make out: "You don't have the change it"

So I keep those commented lines or remove them.

I was commenting on your log message, not on your changes.

There was no need to include "Remove blank lines next to them." in the log message.

Okay.

Since that log msg is going to be included in git repo commit log, do I have to remove it and send a new patchset revision.

Veera

Quoted 11 lines

julia

Quoted 9 lines

But Greg said in comment to patch:
Again, this is not a long-line comment, it is a code line that is commented out. "Remove it in a patch previous to this one please."

Veera

Quoted 2 lines

julia

#6 lore raw

Re: [Outreachy kernel] [PATCH v3 1/3] staging: rtl8723bs: os_dep: Remove commented out code lines

Quoted 22 lines · R Veera Kumar
Quoted 21 lines · Julia Lawall
Quoted 8 lines · R Veera Kumar
Quoted 7 lines · Julia Lawall
Quoted 2 lines · R Veera Kumar

Remove multiple commented out code lines.
Remove blank lines next to them.

Quoted 8 lines
Quoted 4 lines

You don't have the change it, but mentioning removing the blank lines was not really necessary. It is normal that you should clean up the adjacent whitespace when you clean up the code.

Sorry I can't make out: "You don't have the change it"

So I keep those commented lines or remove them.

I was commenting on your log message, not on your changes.

Quoted 8 lines
Quoted 3 lines

There was no need to include "Remove blank lines next to them." in the log message.

Okay.

Since that log msg is going to be included in git repo commit log, do I have to remove it and send a new patchset revision.

No. It doesn't harm anything. It is just not necessary.

julia

Quoted 15 lines

Veera

Quoted 11 lines

julia

Quoted 9 lines

But Greg said in comment to patch:
Again, this is not a long-line comment, it is a code line that is commented out. "Remove it in a patch previous to this one please."

Veera

Quoted 2 lines

julia