staging: rtl8192u: Remove unnecessary scope

Remove scope unnecessary scope that is already enforced by the if
statements scope.

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 975f707..94d898b 100644 (file)
--- a/drivers/staging/rtl8192u/r8192U_dm.c
+++ b/drivers/staging/rtl8192u/r8192U_dm.c
@@ -2300,43 +2300,41 @@ static void dm_check_edca_turbo(
                 * Restore original EDCA according to the declaration of AP.
                 */
                if (priv->bcurrent_turbo_EDCA) {
+                       u8              u1bAIFS;
+                       u32             u4bAcParam;
+                       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);
+
+                       /*
+                        * Check ACM bit.
+                        * If it is set, immediately set ACM control bit to downgrading AC for passing WMM testplan. Annie, 2005-12-13.
+                        */
                        {
-                               u8              u1bAIFS;
-                               u32             u4bAcParam;
-                               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);
-
-                               /*
-                                * Check ACM bit.
-                                * If it is set, immediately set ACM control bit to downgrading AC for passing WMM testplan. Annie, 2005-12-13.
-                                */
-                               {
-                                       /*  TODO:  Modified this part and try to set acm control in only 1 IO processing!! */
-
-                                       PACI_AIFSN      pAciAifsn = (PACI_AIFSN)&(qos_parameters->aifs[0]);
-                                       u8              AcmCtrl;
-
-                                       read_nic_byte(dev, AcmHwCtrl, &AcmCtrl);
-
-                                       if (pAciAifsn->f.ACM) { /*  ACM bit is 1. */
-                                               AcmCtrl |= AcmHw_BeqEn;
-                                       } else {        /* ACM bit is 0. */
-                                               AcmCtrl &= (~AcmHw_BeqEn);
-                                       }
+                               /*  TODO:  Modified this part and try to set acm control in only 1 IO processing!! */
 
-                                       RT_TRACE(COMP_QOS, "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n", AcmCtrl);
-                                       write_nic_byte(dev, AcmHwCtrl, AcmCtrl);
+                               PACI_AIFSN      pAciAifsn = (PACI_AIFSN)&(qos_parameters->aifs[0]);
+                               u8              AcmCtrl;
+
+                               read_nic_byte(dev, AcmHwCtrl, &AcmCtrl);
+
+                               if (pAciAifsn->f.ACM) { /*  ACM bit is 1. */
+                                       AcmCtrl |= AcmHw_BeqEn;
+                               } else {        /* ACM bit is 0. */
+                                       AcmCtrl &= (~AcmHw_BeqEn);
                                }
+
+                               RT_TRACE(COMP_QOS, "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n", AcmCtrl);
+                               write_nic_byte(dev, AcmHwCtrl, AcmCtrl);
                        }
                        priv->bcurrent_turbo_EDCA = false;
                }