staging/rtl8187se: Remove code without effect

Local variable AcmCtrl is never read/used after assignment so we can remove
all assignments to it and the related code around the assignments.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8187se/r8185b_init.c b/drivers/staging/rtl8187se/r8185b_init.c
index f1db9e401c87816282714bfc454f4146210abfab..41419f07d57053540c659365300e3d2e92c3e802 100644 (file)
--- a/drivers/staging/rtl8187se/r8185b_init.c
+++ b/drivers/staging/rtl8187se/r8185b_init.c
@@ -964,54 +964,7 @@ void ActUpdateChannelAccessSetting(struct net_device *dev,
                                        break;
                                }
 
-                               /* Cehck ACM bit. */
-                               /* If it is set, immediately set ACM control bit to downgrading AC for passing WMM testplan. Annie, 2005-12-13. */
-                               {
-                                       PACI_AIFSN      pAciAifsn = (PACI_AIFSN)(&pAcParam->f.AciAifsn);
-                                       AC_CODING       eACI = pAciAifsn->f.ACI;
-
-                                       /*for 8187B AsynIORead issue */
-                                       u8      AcmCtrl = 0;
-                                       if (pAciAifsn->f.ACM) {
-                                               /* ACM bit is 1. */
-                                               switch (eACI) {
-                                               case AC0_BE:
-                                                       AcmCtrl |= (BEQ_ACM_EN|BEQ_ACM_CTL|ACM_HW_EN); /* or 0x21 */
-                                                       break;
-
-                                               case AC2_VI:
-                                                       AcmCtrl |= (VIQ_ACM_EN|VIQ_ACM_CTL|ACM_HW_EN); /* or 0x42 */
-                                                       break;
-
-                                               case AC3_VO:
-                                                       AcmCtrl |= (VOQ_ACM_EN|VOQ_ACM_CTL|ACM_HW_EN); /* or 0x84 */
-                                                       break;
-
-                                               default:
-                                                       DMESGW("SetHwReg8185(): [HW_VAR_ACM_CTRL] ACM set failed: eACI is %d\n", eACI);
-                                                       break;
-                                               }
-                                       } else {
-                                               /* ACM bit is 0. */
-                                               switch (eACI) {
-                                               case AC0_BE:
-                                                       AcmCtrl &= ((~BEQ_ACM_EN) & (~BEQ_ACM_CTL) & (~ACM_HW_EN)); /* and 0xDE */
-                                                       break;
-
-                                               case AC2_VI:
-                                                       AcmCtrl &= ((~VIQ_ACM_EN) & (~VIQ_ACM_CTL) & (~ACM_HW_EN)); /* and 0xBD */
-                                                       break;
-
-                                               case AC3_VO:
-                                                       AcmCtrl &= ((~VOQ_ACM_EN) & (~VOQ_ACM_CTL) & (~ACM_HW_EN)); /* and 0x7B */
-                                                       break;
-
-                                               default:
-                                                       break;
-                                               }
-                                       }
-                                       write_nic_byte(dev, ACM_CONTROL, 0);
-                               }
+                               write_nic_byte(dev, ACM_CONTROL, 0);
                        }
                }
        }