From 33c1576ea1feb1817600aad4299537e92b90ebb5 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Mon, 28 Jul 2014 21:43:29 +0100 Subject: [PATCH] staging: vt6655: dead code remove undefined macro FOR_LED_ON_NOTEBOOK code. Removing all variables associated with the code. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/bssdb.c | 53 ---------------------------- drivers/staging/vt6655/device_main.c | 15 -------- 2 files changed, 68 deletions(-) diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c index 58f85e8febb9..6367684bd218 100644 --- a/drivers/staging/vt6655/bssdb.c +++ b/drivers/staging/vt6655/bssdb.c @@ -901,11 +901,6 @@ BSSvAddMulticastNode( * none. * -*/ -/* 2008-4-14 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 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--; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index fe6de98856ae..e8584fd565c5 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -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 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 -- 2.30.2