Commit 0c59dbaa authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

Staging: w35und: kill WBDEBUG and remove common.h header file 



The only remaining thing in common.h header file is the WBDEBUG() macro which
is unconditionally defined as printk(). Kill the macro and remove the header
file.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Acked-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 132e755a

drivers/staging/winbond/common.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
//

// common.h

//

// This file contains the OS dependant definition and function.

// Every OS has this file individual.

//

#ifndef COMMON_DEF

#define COMMON_DEF



//#define DEBUG_ENABLED  1



//==================================================================================================

// Common function definition

//==================================================================================================

#define DEBUG_ENABLED

#ifdef DEBUG_ENABLED

#define WBDEBUG( _M )	printk _M

#else

#define WBDEBUG( _M )	0

#endif



#endif // COMMON_DEF

drivers/staging/winbond/mds.c

+4 −4
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static void Mds_HeaderCopy(struct wbsoft_priv * adapter, PDESCRIPTOR pDes, u8 *T 


	pDes->TxRate = ctmp1;

	#ifdef _PE_TX_DUMP_

	WBDEBUG(("Tx rate =%x\n", ctmp1));

	printk("Tx rate =%x\n", ctmp1);

	#endif



	pT01->T01_modulation_type = (ctmp1%3) ? 0 : 1;
@@ -442,7 +442,7 @@ Mds_Tx(struct wbsoft_priv * adapter) 
		FillIndex = pMds->TxFillIndex;

		if (pMds->TxOwner[FillIndex]) { // Is owned by software 0:Yes 1:No

#ifdef _PE_TX_DUMP_

			WBDEBUG(("[Mds_Tx] Tx Owner is H/W.\n"));

			printk("[Mds_Tx] Tx Owner is H/W.\n");

#endif

			break;

		}
@@ -488,7 +488,7 @@ Mds_Tx(struct wbsoft_priv * adapter) 
			// For speed up Key setting

			if (pTxDes->EapFix) {

#ifdef _PE_TX_DUMP_

				WBDEBUG(("35: EPA 4th frame detected. Size = %d\n", PacketSize));

				printk("35: EPA 4th frame detected. Size = %d\n", PacketSize);

#endif

				pHwData->IsKeyPreSet = 1;

			}
@@ -585,7 +585,7 @@ Mds_SendComplete(struct wbsoft_priv * adapter, PT02_DESCRIPTOR pT02) 
				else

					pHwData->tx_retry_count[7] += RetryCount;

				#ifdef _PE_STATE_DUMP_

				WBDEBUG(("dto_tx_retry_count =%d\n", pHwData->dto_tx_retry_count));

				printk("dto_tx_retry_count =%d\n", pHwData->dto_tx_retry_count);

				#endif

				MTO_SetTxCount(adapter, TxRate, RetryCount);

			}

drivers/staging/winbond/mto.c

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ void hal_get_dto_para(MTO_FUNC_INPUT, char *buffer); 
void MTO_Init(MTO_FUNC_INPUT)

{

    int i;

	//WBDEBUG(("[MTO] -> MTO_Init()\n"));

	//[WKCHEN]pMTOcore_data = pcore_data;

// 20040510 Turbo add for global variable

    MTO_TMR_CNT()       = 0;

drivers/staging/winbond/reg.c

+9 −9
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ RFSynthesizer_initial(phw_data_t pHwData) 
		//Start to fill RF parameters, PLL_ON should be pulled low.

		Wb35Reg_WriteSync( pHwData, 0x03dc, 0x00000000 );

#ifdef _PE_STATE_DUMP_

		WBDEBUG(("* PLL_ON    low\n"));

		printk("* PLL_ON    low\n");

#endif



		number = sizeof(al7230_rf_data_24)/sizeof(al7230_rf_data_24[0]);
@@ -1223,7 +1223,7 @@ RFSynthesizer_initial(phw_data_t pHwData) 
			//pulled high

			Wb35Reg_WriteSync( pHwData, 0x03dc, 0x00000080 );

			#ifdef _PE_STATE_DUMP_

			WBDEBUG(("* PLL_ON    high\n"));

			printk("* PLL_ON    high\n");

			#endif



			//2.4GHz
@@ -1243,7 +1243,7 @@ RFSynthesizer_initial(phw_data_t pHwData) 
			//5GHz

			Wb35Reg_WriteSync( pHwData, 0x03dc, 0x00000000 );

			#ifdef _PE_STATE_DUMP_

			WBDEBUG(("* PLL_ON    low\n"));

			printk("* PLL_ON    low\n");

			#endif



			number = sizeof(al7230_rf_data_50)/sizeof(al7230_rf_data_50[0]);
@@ -1255,7 +1255,7 @@ RFSynthesizer_initial(phw_data_t pHwData) 


			Wb35Reg_WriteSync( pHwData, 0x03dc, 0x00000080 );

			#ifdef _PE_STATE_DUMP_

			WBDEBUG(("* PLL_ON    high\n"));

			printk("* PLL_ON    high\n");

			#endif



			//ltmp = (1 << 31) | (0 << 30) | (24 << 24) | 0x12BACF;
@@ -1271,7 +1271,7 @@ RFSynthesizer_initial(phw_data_t pHwData) 
			msleep(5);



			//Wb35Reg_WriteSync( pHwData, 0x03dc, 0x00000080 );

			//WBDEBUG(("* PLL_ON    high\n"));

			//printk("* PLL_ON    high\n");

			break;



		case RF_WB_242:
@@ -2011,7 +2011,7 @@ RFSynthesizer_SwitchingChannel( phw_data_t pHwData, ChanInfo Channel ) 


			//Start to fill RF parameters, PLL_ON should be pulled low.

			//Wb35Reg_Write( pHwData, 0x03dc, 0x00000000 );

			//WBDEBUG(("* PLL_ON    low\n"));

			//printk("* PLL_ON    low\n");



			//Channel independent registers

			if( Channel.band != pHwData->band)
@@ -2036,7 +2036,7 @@ RFSynthesizer_SwitchingChannel( phw_data_t pHwData, ChanInfo Channel ) 
				// Write to register. number must less and equal than 16

				Wb35Reg_BurstWrite( pHwData, 0x0864, pltmp, number, NO_INCREMENT );

				#ifdef _PE_STATE_DUMP_

				WBDEBUG(("Band changed\n"));

				printk("Band changed\n");

				#endif

			}
@@ -2611,9 +2611,9 @@ void EEPROMTxVgaAdjust( phw_data_t pHwData ) // 20060619.5 Add 
	}



	#ifdef _PE_STATE_DUMP_

	WBDEBUG((" TxVgaFor24 : \n"));

	printk(" TxVgaFor24 : \n");

	DataDmp((u8 *)pHwData->TxVgaFor24, 14 ,0);

	WBDEBUG((" TxVgaFor50 : \n"));

	printk(" TxVgaFor50 : \n");

	DataDmp((u8 *)pHwData->TxVgaFor50, 70 ,0);

	#endif

}

drivers/staging/winbond/wb35reg.c

+5 −5
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ Wb35Reg_WriteSync( phw_data_t pHwData, u16 RegisterNo, u32 RegisterValue ) 


	if (ret < 0) {

		#ifdef _PE_REG_DUMP_

		WBDEBUG(("EP0 Write register usb message sending error\n"));

		printk("EP0 Write register usb message sending error\n");

		#endif



		pHwData->SurpriseRemove = 1; // 20060704.2
@@ -316,7 +316,7 @@ Wb35Reg_ReadSync( phw_data_t pHwData, u16 RegisterNo, u32 * pRegisterValue ) 


	if (ret < 0) {

		#ifdef _PE_REG_DUMP_

		WBDEBUG(("EP0 Read register usb message sending error\n"));

		printk("EP0 Read register usb message sending error\n");

		#endif



		pHwData->SurpriseRemove = 1; // 20060704.2
@@ -441,7 +441,7 @@ Wb35Reg_EP0VM(phw_data_t pHwData ) 


	if (ret < 0) {

#ifdef _PE_REG_DUMP_

		WBDEBUG(("EP0 Irp sending error\n"));

		printk("EP0 Irp sending error\n");

#endif

		goto cleanup;

	}
@@ -480,7 +480,7 @@ Wb35Reg_EP0VM_complete(struct urb *urb) 


		if (reg->EP0VM_status) {

#ifdef _PE_REG_DUMP_

			WBDEBUG(("EP0 IoCompleteRoutine return error\n"));

			printk("EP0 IoCompleteRoutine return error\n");

#endif

			reg->EP0vm_state = VM_STOP;

			pHwData->SurpriseRemove = 1;
@@ -529,7 +529,7 @@ Wb35Reg_destroy(phw_data_t pHwData) 
			kfree(reg_queue);

		} else {

			#ifdef _PE_REG_DUMP_

			WBDEBUG(("EP0 queue release error\n"));

			printk("EP0 queue release error\n");

			#endif

		}

		spin_lock_irq( &reg->EP0VM_spin_lock );