[PATCH] staging: rtl8192e: Remove multiple assignments

[PATCH] staging: rtl8192e: Remove multiple assignments

[Bhaktipriya Shridhar]

This patch removes multiple assignments by factorizing them.

This was done with Coccinelle.

@ identifier i1,i2; constant c; @@
- i1=i2=c;
+ i1=c;
+ i2=c;

Signed-off-by: Bhaktipriya Shridhar <bhaktipriya96@gmail.com>
---
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index b6b714d..6834652 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -887,8 +887,10 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
 			tmpCCK40Mindex = CCK_Table_length-1;
 	} else {
 		tmpval = ((u8)tmpRegA - priv->ThermalMeter[0]);
-		if (tmpval >= 6)
-			tmpOFDMindex = tmpCCK20Mindex = 0;
+		if (tmpval >= 6) {
+			tmpOFDMindex = 0;
+			tmpCCK20Mindex = 0;
+		}
 		else
 			tmpOFDMindex = tmpCCK20Mindex = 6 - tmpval;
 		tmpCCK40Mindex = 0;
--
2.1.4

Re: [Outreachy kernel] [PATCH] staging: rtl8192e: Remove multiple assignments

[Greg KH]

On Sun, Mar 06, 2016 at 02:32:23AM +0530, Bhaktipriya Shridhar wrote:
> This patch removes multiple assignments by factorizing them.
> 
> This was done with Coccinelle.
> 
> @ identifier i1,i2; constant c; @@
> - i1=i2=c;
> + i1=c;
> + i2=c;
> 
> Signed-off-by: Bhaktipriya Shridhar <bhaktipriya96@gmail.com>
> ---
>  drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> index b6b714d..6834652 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> @@ -887,8 +887,10 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
>  			tmpCCK40Mindex = CCK_Table_length-1;
>  	} else {
>  		tmpval = ((u8)tmpRegA - priv->ThermalMeter[0]);
> -		if (tmpval >= 6)
> -			tmpOFDMindex = tmpCCK20Mindex = 0;
> +		if (tmpval >= 6) {
> +			tmpOFDMindex = 0;
> +			tmpCCK20Mindex = 0;
> +		}
>  		else

Your brace placement is wrong here :(

Re: [Outreachy kernel] [PATCH] staging: rtl8192e: Remove multiple assignments

[Julia Lawall]

On Sat, 11 Mar 2017, Gargi Sharma wrote:

> This patch removes multiple assignments by factorizing them.
> This was done with Coccinelle. Braces were also added to the
> else part to remove the checkpatch warning, "braces should be
> on all arms of if-else statements".
>
> @ identifier i1,i2; constant c; @@
> - i1=i2=c;
> + i1=c;
> + i2=c;
>
> Signed-off-by: Gargi Sharma <gs051095@gmail.com>
> ---
>  drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> index d101974..32e51be 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
> @@ -887,10 +887,12 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
>  			tmpCCK40Mindex = CCK_Table_length-1;
>  	} else {
>  		tmpval = (u8)tmpRegA - priv->ThermalMeter[0];
> -		if (tmpval >= 6)
> -			tmpOFDMindex = tmpCCK20Mindex = 0;
> -		else
> +		if (tmpval >= 6) {
> +			tmpOFDMindex = 0;
> +			tmpCCK20Mindex = 0;
> +		} else {
>  			tmpOFDMindex = tmpCCK20Mindex = 6 - tmpval;

Coccinelle doesn't find it because the right hand side of the assignment
is not a constant, but you could do the else branch as well (and mention
in the commit message that you did this part additionally).

julia

> +		}
>  		tmpCCK40Mindex = 0;
>  	}
>  	if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)
> --
> 2.7.4
>
> --
> 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 outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1489241955-12103-1-git-send-email-gs051095%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>

Re: [Outreachy kernel] [PATCH] staging: rtl8192e: Remove multiple assignments

[Gargi Sharma]

On Sat, Mar 11, 2017 at 8:21 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
>
>
> On Sat, 11 Mar 2017, Gargi Sharma wrote:
>
>> This patch removes multiple assignments by factorizing them.
>> This was done with Coccinelle. Braces were also added to the
>> else part to remove the checkpatch warning, "braces should be
>> on all arms of if-else statements".
>>
>> @ identifier i1,i2; constant c; @@
>> - i1=i2=c;
>> + i1=c;
>> + i2=c;
>>
>> Signed-off-by: Gargi Sharma <gs051095@gmail.com>
>> ---
>>  drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 8 +++++---
>>  1 file changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
>> index d101974..32e51be 100644
>> --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
>> +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
>> @@ -887,10 +887,12 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev)
>>                       tmpCCK40Mindex = CCK_Table_length-1;
>>       } else {
>>               tmpval = (u8)tmpRegA - priv->ThermalMeter[0];
>> -             if (tmpval >= 6)
>> -                     tmpOFDMindex = tmpCCK20Mindex = 0;
>> -             else
>> +             if (tmpval >= 6) {
>> +                     tmpOFDMindex = 0;
>> +                     tmpCCK20Mindex = 0;
>> +             } else {
>>                       tmpOFDMindex = tmpCCK20Mindex = 6 - tmpval;
>
> Coccinelle doesn't find it because the right hand side of the assignment
> is not a constant, but you could do the else branch as well (and mention
> in the commit message that you did this part additionally).

Oh yeah sure. I missed it completely. :')

Thanks,
Gargi
>
> julia
>
>> +             }
>>               tmpCCK40Mindex = 0;
>>       }
>>       if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)
>> --
>> 2.7.4
>>
>> --
>> 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 outreachy-kernel+unsubscribe@googlegroups.com.
>> To post to this group, send email to outreachy-kernel@googlegroups.com.
>> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1489241955-12103-1-git-send-email-gs051095%40gmail.com.
>> For more options, visit https://groups.google.com/d/optout.
>>
>
> --
> 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 outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/alpine.DEB.2.20.1703111550410.3127%40hadrien.
> For more options, visit https://groups.google.com/d/optout.