Skip to contentSkip to conversation

Staging: rtl8192u: ieee80211: fixed a trailing statements of condition.

PATCH In review [email protected] 2 participants 3 messages Apr 4, 2021 – Apr 6, 2021 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: rtl8192u: ieee80211: fixed a trailing statements of condition.

From: Dmitrii Wolf <[email protected]>

Fixed a coding style issue.

---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +4 -4
index 690b664df8fa..29a6ce20e2bd 100644
@@ -2048,12 +2048,12 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *
 	/* if xmit available, just xmit it immediately, else just insert it to the wait queue */
 	for (i = 0; i < txb->nr_frags; i++) {
 #ifdef USB_TX_DRIVER_AGGREGATION_ENABLE
-		if ((skb_queue_len(&ieee->skb_drv_aggQ[queue_index]) != 0) ||
+		if ((skb_queue_len(&ieee->skb_drv_aggQ[queue_index]) != 0)
 #else
-		if ((skb_queue_len(&ieee->skb_waitQ[queue_index]) != 0) ||
+		if ((skb_queue_len(&ieee->skb_waitQ[queue_index]) != 0)
 #endif
-		    (!ieee->check_nic_enough_desc(ieee->dev, queue_index)) || \
-		    (ieee->queue_stop)) {
+		 || (!ieee->check_nic_enough_desc(ieee->dev, queue_index)) \
+		 || (ieee->queue_stop)) {
 			/* insert the skb packet to the wait queue */
 			/* as for the completion function, it does not need
 			 * to check it any more.
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 3 lines · On Sun, Apr 04, 2021 at 04:26:14PM +0300, [email protected] wrote:

From: Dmitrii Wolf <[email protected]>

Fixed a coding style issue.

Really?

Quoted 14 lines
---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +0 -0
index 690b664df8fa..29a6ce20e2bd 100644
@@ -2048,12 +2048,12 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *
 	/* if xmit available, just xmit it immediately, else just insert it to the wait queue */
 	for (i = 0; i < txb->nr_frags; i++) {
 #ifdef USB_TX_DRIVER_AGGREGATION_ENABLE

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device * · line 2056

Quoted 10 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +4 -4
-		if ((skb_queue_len(&ieee->skb_drv_aggQ[queue_index]) != 0) ||
+		if ((skb_queue_len(&ieee->skb_drv_aggQ[queue_index]) != 0)
 #else
-		if ((skb_queue_len(&ieee->skb_waitQ[queue_index]) != 0) ||
+		if ((skb_queue_len(&ieee->skb_waitQ[queue_index]) != 0)
 #endif
-		    (!ieee->check_nic_enough_desc(ieee->dev, queue_index)) || \
-		    (ieee->queue_stop)) {
+		 || (!ieee->check_nic_enough_desc(ieee->dev, queue_index)) \
+		 || (ieee->queue_stop)) {

This feels really wrong.

The || should be on the end of the line, why is checkpatch complaining about this?

And that '\' is not needed at all :(

thanks,

greg k-h

author
#2 lore raw
Quoted 25 lines · Greg KH
Quoted 3 lines · On Sun, Apr 04, 2021 at 04:26:14PM +0300, [email protected] wrote:

From: Dmitrii Wolf <[email protected]>

Fixed a coding style issue.

Really?

Quoted 18 lines
---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +1 -2
index 690b664df8fa..29a6ce20e2bd 100644
@@ -2048,12 +2048,12 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *
 	/* if xmit available, just xmit it immediately, else just insert it to the wait queue */
 	for (i = 0; i < txb->nr_frags; i++) {
 #ifdef USB_TX_DRIVER_AGGREGATION_ENABLE
-		if ((skb_queue_len(&ieee->skb_drv_aggQ[queue_index]) != 0) ||
+		if ((skb_queue_len(&ieee->skb_drv_aggQ[queue_index]) != 0)
 #else
-		if ((skb_queue_len(&ieee->skb_waitQ[queue_index]) != 0) ||
Quoted 8 lines

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device * · line 2056

Quoted 6 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +3 -2
+		if ((skb_queue_len(&ieee->skb_waitQ[queue_index]) != 0)
 #endif
-		    (!ieee->check_nic_enough_desc(ieee->dev, queue_index)) || \
-		    (ieee->queue_stop)) {
+		 || (!ieee->check_nic_enough_desc(ieee->dev, queue_index)) \
+		 || (ieee->queue_stop)) {

This feels really wrong.

Reread coding style - agree with you.

Quoted 3 lines

The || should be on the end of the line, why is checkpatch complaining about this?

Looks like it was confused by preprocessor directives - excluding it by comments gave me positive checkpatch respond.

Quoted 2 lines

And that '\' is not needed at all :(

Can i fix it in my next patch?:)

Quoted 5 lines

thanks,

greg k-h