Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33c1576e authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: dead code remove undefined macro FOR_LED_ON_NOTEBOOK code. 



Removing all variables associated with the code.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9a802f2e

drivers/staging/vt6655/bssdb.c

+0 −53
Original line number Original line Diff line number Diff line
@@ -901,11 +901,6 @@ BSSvAddMulticastNode( 
 *    none.

 *    none.

 *

 *

 -*/

 -*/

/* 2008-4-14 <add> by chester for led issue */

#ifdef FOR_LED_ON_NOTEBOOK

bool cc = false;

unsigned int status;

#endif

void

void

BSSvSecondCallBack(

BSSvSecondCallBack(

	void *hDeviceContext

	void *hDeviceContext
@@ -926,54 +921,6 @@ BSSvSecondCallBack( 




	pDevice->byERPFlag &=

	pDevice->byERPFlag &=

		~(WLAN_SET_ERP_BARKER_MODE(1) | WLAN_SET_ERP_NONERP_PRESENT(1));

		~(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) {

	if (pDevice->wUseProtectCntDown > 0) {

		pDevice->wUseProtectCntDown--;

		pDevice->wUseProtectCntDown--;

drivers/staging/vt6655/device_main.c

+0 −15
Original line number Original line Diff line number Diff line
@@ -691,19 +691,6 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) 
			// Get GPIO

			// Get GPIO

			MACvGPIOIn(pDevice->PortOffset, &pDevice->byGPIO);

			MACvGPIOIn(pDevice->PortOffset, &pDevice->byGPIO);

//2008-4-14 <add> by chester for led issue

//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)) ||

		if (((pDevice->byGPIO & GPIO0_DATA) && !(pDevice->byRadioCtl & EEP_RADIOCTL_INV)) ||

		    (!(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV))) {

		    (!(pDevice->byGPIO & GPIO0_DATA) && (pDevice->byRadioCtl & EEP_RADIOCTL_INV))) {

			pDevice->bHWRadioOff = true;

			pDevice->bHWRadioOff = true;
@@ -711,8 +698,6 @@ static void device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) 
	}

	}

	if (pDevice->bHWRadioOff || pDevice->bRadioControlOff)

	if (pDevice->bHWRadioOff || pDevice->bRadioControlOff)

		CARDbRadioPowerOff(pDevice);

		CARDbRadioPowerOff(pDevice);



#endif

}

}

pMgmt->eScanType = WMAC_SCAN_PASSIVE;

pMgmt->eScanType = WMAC_SCAN_PASSIVE;

// get Permanent network address

// get Permanent network address