]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: rtl8192u: Remove multiple assignments
authorGargi Sharma <gs051095@gmail.com>
Tue, 14 Mar 2017 18:43:21 +0000 (00:13 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 16 Mar 2017 02:34:53 +0000 (11:34 +0900)
This patch removes multiple assignments by factorizing them.
This was done with Coccinelle for the if branch. For the else part
the change was done manually since Coccinelle only detects constants.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192u/r8192U_dm.c

index 5a07e7e71549e578a1d7ae33ad24414bcf26792c..623d49585bee59b9ba2707b5a0037d8210a78ce3 100644 (file)
@@ -725,10 +725,15 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
        } else {
                tmpval = (u8)tmpRegA - priv->ThermalMeter[0];
 
-               if (tmpval >= 6) /* higher temperature */
-                       tmpOFDMindex = tmpCCK20Mindex = 0; /* max to +6dB */
-               else
-                       tmpOFDMindex = tmpCCK20Mindex = 6 - tmpval;
+               if (tmpval >= 6) {
+                       /* higher temperature */
+                       tmpOFDMindex = 0;
+                       tmpCCK20Mindex = 0;
+               } else {
+                       /* max to +6dB */
+                       tmpOFDMindex = 6 - tmpval;
+                       tmpCCK20Mindex = 6 - tmpval;
+               }
                tmpCCK40Mindex = 0;
        }
        /*DbgPrint("%ddb, tmpOFDMindex = %d, tmpCCK20Mindex = %d, tmpCCK40Mindex = %d",