staging: rtl8192e: Remove multiple assignments
authorGargi Sharma <gs051095@gmail.com>
Sat, 11 Mar 2017 14:57:20 +0000 (20:27 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 12 Mar 2017 13:46:34 +0000 (14:46 +0100)
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. 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/rtl8192e/rtl8192e/rtl_dm.c

index d10197464df65f96446c0e75a65a7cff42a047f2..d40621c985062f0344e67012ea390843fe0ae33d 100644 (file)
@@ -887,10 +887,13 @@ 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
-                       tmpOFDMindex = tmpCCK20Mindex = 6 - tmpval;
+               if (tmpval >= 6) {
+                       tmpOFDMindex = 0;
+                       tmpCCK20Mindex = 0;
+               } else {
+                       tmpOFDMindex = 6 - tmpval;
+                       tmpCCK20Mindex = 6 - tmpval;
+               }
                tmpCCK40Mindex = 0;
        }
        if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)