staging: rtl8192u: Improve code readability

Split the u4bAcParam parameter construction to multiple lines for easier
readability.

Signed-off-by: Tuomo Rinne <tuomo.rinne@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c
index 94d898b..283dda4 100644 (file)
--- a/drivers/staging/rtl8192u/r8192U_dm.c
+++ b/drivers/staging/rtl8192u/r8192U_dm.c
@@ -2300,20 +2300,30 @@ static void dm_check_edca_turbo(
                 * Restore original EDCA according to the declaration of AP.
                 */
                if (priv->bcurrent_turbo_EDCA) {
-                       u8              u1bAIFS;
-                       u32             u4bAcParam;
+                       u8      u1bAIFS;
+                       u32     u4bAcParam, op_limit, cw_max, cw_min;
+
                        struct ieee80211_qos_parameters *qos_parameters = &priv->ieee80211->current_network.qos_data.parameters;
                        u8 mode = priv->ieee80211->mode;
 
                        /*  For Each time updating EDCA parameter, reset EDCA turbo mode status. */
                        dm_init_edca_turbo(dev);
-                       u1bAIFS = qos_parameters->aifs[0] * ((mode&(IEEE_G|IEEE_N_24G)) ? 9 : 20) + aSifsTime;
-                       u4bAcParam = (((le16_to_cpu(qos_parameters->tx_op_limit[0])) << AC_PARAM_TXOP_LIMIT_OFFSET)|
-                               ((le16_to_cpu(qos_parameters->cw_max[0])) << AC_PARAM_ECW_MAX_OFFSET)|
-                               ((le16_to_cpu(qos_parameters->cw_min[0])) << AC_PARAM_ECW_MIN_OFFSET)|
-                               ((u32)u1bAIFS << AC_PARAM_AIFS_OFFSET));
-                       /*write_nic_dword(dev, WDCAPARA_ADD[i], u4bAcParam);*/
-                       write_nic_dword(dev, EDCAPARA_BE,  u4bAcParam);
+
+                       u1bAIFS = qos_parameters->aifs[0] * ((mode & (IEEE_G | IEEE_N_24G)) ? 9 : 20) + aSifsTime;
+
+                       op_limit = (u32)le16_to_cpu(qos_parameters->tx_op_limit[0]);
+                       cw_max   = (u32)le16_to_cpu(qos_parameters->cw_max[0]);
+                       cw_min   = (u32)le16_to_cpu(qos_parameters->cw_min[0]);
+
+                       op_limit <<= AC_PARAM_TXOP_LIMIT_OFFSET;
+                       cw_max   <<= AC_PARAM_ECW_MAX_OFFSET;
+                       cw_min   <<= AC_PARAM_ECW_MIN_OFFSET;
+                       u1bAIFS  <<= AC_PARAM_AIFS_OFFSET;
+
+                       u4bAcParam = op_limit | cw_max | cw_min | u1bAIFS;
+
+                       write_nic_dword(dev, EDCAPARA_BE, u4bAcParam);
+
 
                        /*
                         * Check ACM bit.