[PATCH] Staging: rtl8192u: ieee80211: fixed a trailing statements of condition.

[PATCH] Staging: rtl8192u: ieee80211: fixed a trailing statements of condition.

[dev.dragon]

From: Dmitrii Wolf <dev.dragon@bk.ru>

Fixed a coding style issue.

Signed-off-by: Dmitrii Wolf <dev.dragon@bk.ru>
---
 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
index 690b664df8fa..29a6ce20e2bd 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
@@ -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.
-- 
2.25.1

Re: [PATCH] Staging: rtl8192u: ieee80211: fixed a trailing statements of condition.

[Greg KH]

On Sun, Apr 04, 2021 at 04:26:14PM +0300, dev.dragon@bk.ru wrote:
> From: Dmitrii Wolf <dev.dragon@bk.ru>
> 
> Fixed a coding style issue.

Really?

> 
> Signed-off-by: Dmitrii Wolf <dev.dragon@bk.ru>
> ---
>  drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
> index 690b664df8fa..29a6ce20e2bd 100644
> --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
> +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
> @@ -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)) {

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

Re: [PATCH] Staging: rtl8192u: ieee80211: fixed a trailing statements of condition.

[dev.dragon]

On 4/5/21 1:15 PM, Greg KH wrote:
> On Sun, Apr 04, 2021 at 04:26:14PM +0300, dev.dragon@bk.ru wrote:
>> From: Dmitrii Wolf <dev.dragon@bk.ru>
>>
>> Fixed a coding style issue.
> 
> Really?
> 
>>
>> Signed-off-by: Dmitrii Wolf <dev.dragon@bk.ru>
>> ---
>>  drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
>> index 690b664df8fa..29a6ce20e2bd 100644
>> --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
>> +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
>> @@ -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)) {
> 
> This feels really wrong.
Reread coding style - agree with you.
> 
> 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.
> 
> And that '\' is not needed at all :(
Can i fix it in my next patch?:)
> 
> thanks,
> 
> greg k-h
>