staging: vt6655: dead code remove undefined macro FOR_LED_ON_NOTEBOOK code.
authorMalcolm Priestley <tvboxspy@gmail.com>
Mon, 28 Jul 2014 20:43:29 +0000 (21:43 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 31 Jul 2014 00:07:32 +0000 (17:07 -0700)
Removing all variables associated with the code.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/bssdb.c
drivers/staging/vt6655/device_main.c

index 58f85e8febb9f2dfa141c12a99a63625cb737185..6367684bd2180f035eb03ea9f3d6281ba749cabb 100644 (file)
@@ -901,11 +901,6 @@ BSSvAddMulticastNode(
  *    none.
  *
  -*/
-/* 2008-4-14 <add> by chester for led issue */
-#ifdef FOR_LED_ON_NOTEBOOK
-bool cc = false;
-unsigned int status;
-#endif
 void
 BSSvSecondCallBack(
        void *hDeviceContext
@@ -926,54 +921,6 @@ BSSvSecondCallBack(
 
        pDevice->byERPFlag &=
                ~(WLAN_SET_ERP_BARKER_MODE(1) | WLAN_SET_ERP_NONERP_PRESENT(1));
-       /* 2008-4-14 <add> by chester for led issue */
-#ifdef FOR_LED_ON_NOTEBOOK
-       MACvGPIOIn(pDevice->PortOffset, &pDevice->byGPIO);
-       if (((!(pDevice->byGPIO & GPIO0_DATA) && (!pDevice->bHWRadioOff)) ||
-            ((pDevice->byGPIO & GPIO0_DATA) && pDevice->bHWRadioOff)) &&
-           (!cc)) {
-               cc = true;
-       } else if (cc) {
-               if (pDevice->bHWRadioOff) {
-                       if (!(pDevice->byGPIO & GPIO0_DATA)) {
-                               if (status == 1)
-                                       goto start;
-                               status = 1;
-                               CARDbRadioPowerOff(pDevice);
-                               pMgmt->sNodeDBTable[0].bActive = false;
-                               pMgmt->eCurrMode = WMAC_MODE_STANDBY;
-                               pMgmt->eCurrState = WMAC_STATE_IDLE;
-                               pDevice->bLinkPass = false;
-
-                       }
-                       if (pDevice->byGPIO & GPIO0_DATA) {
-                               if (status == 2)
-                                       goto start;
-                               status = 2;
-                               CARDbRadioPowerOn(pDevice);
-                       }
-               } else {
-                       if (pDevice->byGPIO & GPIO0_DATA) {
-                               if (status == 3)
-                                       goto start;
-                               status = 3;
-                               CARDbRadioPowerOff(pDevice);
-                               pMgmt->sNodeDBTable[0].bActive = false;
-                               pMgmt->eCurrMode = WMAC_MODE_STANDBY;
-                               pMgmt->eCurrState = WMAC_STATE_IDLE;
-                               pDevice->bLinkPass = false;
-
-                       }
-                       if (!(pDevice->byGPIO & GPIO0_DATA)) {
-                               if (status == 4)
-                                       goto start;
-                               status = 4;
-                               CARDbRadioPowerOn(pDevice);
-                       }
-               }
-       }
-start:
-#endif
 
        if (pDevice->wUseProtectCntDown > 0) {
                pDevice->wUseProtectCntDown--;
index fe6de98856aead92126e67ed9b04194f0e431c77..e8584fd565c5495d9bf6bee2b3528f01572c21a7 100644 (file)
@@ -691,19 +691,6 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
                        // Get GPIO
                        MACvGPIOIn(pDevice->PortOffset, &pDevice->byGPIO);
 //2008-4-14 <add> by chester for led issue
-#ifdef FOR_LED_ON_NOTEBOOK
-                       if (pDevice->byGPIO & GPIO0_DATA)
-                               pDevice->bHWRadioOff = true;
-
-                       if (!(pDevice->byGPIO & GPIO0_DATA))
-                               pDevice->bHWRadioOff = false;
-               }
-
-               if (pDevice->bRadioControlOff)
-                       CARDbRadioPowerOff(pDevice);
-               else
-                       CARDbRadioPowerOn(pDevice);
-#else
                if (((pDevice->byGPIO & GPIO0_DATA) && !(pDevice->byRadioCtl & EEP_RADIOCTL_INV)) ||
                    (!(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV))) {
                        pDevice->bHWRadioOff = true;
@@ -711,8 +698,6 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
        }
        if (pDevice->bHWRadioOff || pDevice->bRadioControlOff)
                CARDbRadioPowerOff(pDevice);
-
-#endif
 }
 pMgmt->eScanType = WMAC_SCAN_PASSIVE;
 // get Permanent network address