Commit 5e1ad18a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: rtl8192e: fix lots of sparse warnings 



This removes a number of static and extern warnings that sparse
complains about.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ecdfa446

drivers/staging/rtl8192e/r8180_93cx6.c

+5 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include "r8180_93cx6.h"



void eprom_cs(struct net_device *dev, short bit)

static void eprom_cs(struct net_device *dev, short bit)

{

	if(bit)

		write_nic_byte(dev, EPROM_CMD,
@@ -35,7 +35,7 @@ void eprom_cs(struct net_device *dev, short bit) 
}





void eprom_ck_cycle(struct net_device *dev)

static void eprom_ck_cycle(struct net_device *dev)

{

	write_nic_byte(dev, EPROM_CMD,

		       (1<<EPROM_CK_SHIFT) | read_nic_byte(dev,EPROM_CMD));
@@ -48,7 +48,7 @@ void eprom_ck_cycle(struct net_device *dev) 
}





void eprom_w(struct net_device *dev,short bit)

static void eprom_w(struct net_device *dev,short bit)

{

	if(bit)

		write_nic_byte(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) | \
@@ -62,7 +62,7 @@ void eprom_w(struct net_device *dev,short bit) 
}





short eprom_r(struct net_device *dev)

static short eprom_r(struct net_device *dev)

{

	short bit;
@@ -74,7 +74,7 @@ short eprom_r(struct net_device *dev) 
}





void eprom_send_bits_string(struct net_device *dev, short b[], int len)

static void eprom_send_bits_string(struct net_device *dev, short b[], int len)

{

	int i;

drivers/staging/rtl8192e/r8190_rtl8256.c

+7 −7
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ void PHY_SetRF8256OFDMTxPower(struct net_device* dev, u8 powerlevel) 
}



#define MAX_DOZE_WAITING_TIMES_9x 64

bool

static bool

SetRFPowerState8190(

	struct net_device* dev,

	RT_RF_POWER_STATE	eRFPowerState
@@ -717,7 +717,7 @@ SetRFPowerState8190( 
//

//	050823, by rcnjko.

//

bool

static bool

SetRFPowerState(

	struct net_device* dev,

	RT_RF_POWER_STATE	eRFPowerState
@@ -745,7 +745,7 @@ SetRFPowerState( 
	return bResult;

}



void

static void

MgntDisconnectIBSS(

	struct net_device* dev

)
@@ -823,7 +823,7 @@ MgntDisconnectIBSS( 


}



void

static void

MlmeDisassociateRequest(

	struct net_device* dev,

	u8* 		asSta,
@@ -837,7 +837,7 @@ MlmeDisassociateRequest( 


	SendDisassociation( priv->ieee80211, asSta, asRsn );



	if(memcpy(priv->ieee80211->current_network.bssid,asSta,6) == 0)

	if(memcpy(priv->ieee80211->current_network.bssid,asSta,6) == NULL)

	{

		//ShuChen TODO: change media status.

		//ShuChen TODO: What to do when disassociate.
@@ -891,7 +891,7 @@ MlmeDisassociateRequest( 
}





void

static void

MgntDisconnectAP(

	struct net_device* dev,

	u8 asRsn
@@ -945,7 +945,7 @@ MgntDisconnectAP( 
}





bool

static bool

MgntDisconnect(

	struct net_device* dev,

	u8 asRsn

drivers/staging/rtl8192e/r8192E_core.c

+81 −87

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8192e/r8192E_dm.c

+20 −35
Original line number Diff line number Diff line
@@ -202,8 +202,7 @@ static void dm_ctstoself(struct net_device *dev); 
//		This function is only invoked at driver intialization once.

//

//

extern	void

init_hal_dm(struct net_device *dev)

void init_hal_dm(struct net_device *dev)

{

	struct r8192_priv *priv = ieee80211_priv(dev);
@@ -230,7 +229,7 @@ init_hal_dm(struct net_device *dev) 


}	// InitHalDm



extern void deinit_hal_dm(struct net_device *dev)

void deinit_hal_dm(struct net_device *dev)

{



	dm_deInit_fsync(dev);
@@ -296,7 +295,7 @@ void dm_CheckRxAggregation(struct net_device *dev) { 






extern  void    hal_dm_watchdog(struct net_device *dev)

void hal_dm_watchdog(struct net_device *dev)

{

        //struct r8192_priv *priv = ieee80211_priv(dev);
@@ -334,7 +333,7 @@ extern void hal_dm_watchdog(struct net_device *dev) 
  *	01/16/2008	MHC		RF_Type is assigned in ReadAdapterInfo(). We must call

  *						the function after making sure RF_Type.

  */

extern void init_rate_adaptive(struct net_device * dev)

void init_rate_adaptive(struct net_device * dev)

{



	struct r8192_priv *priv = ieee80211_priv(dev);
@@ -1053,7 +1052,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device * dev) 
}

#endif

#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))

extern	void	dm_txpower_trackingcallback(struct work_struct *work)

void dm_txpower_trackingcallback(struct work_struct *work)

{

	struct delayed_work *dwork = container_of(work,struct delayed_work,work);

       struct r8192_priv *priv = container_of(dwork,struct r8192_priv,txpower_tracking_wq);
@@ -1837,10 +1836,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH 
#endif





extern void dm_cck_txpower_adjust(

	struct net_device *dev,

	bool  binch14

)

void dm_cck_txpower_adjust(struct net_device *dev, bool binch14)

{	// dm_CCKTxPowerAdjust

#ifndef RTL8190P

	struct r8192_priv *priv = ieee80211_priv(dev);
@@ -1879,7 +1875,7 @@ static void dm_txpower_reset_recovery( 


}	// dm_TXPowerResetRecovery



extern void dm_restore_dynamic_mechanism_state(struct net_device *dev)

void dm_restore_dynamic_mechanism_state(struct net_device *dev)

{

	struct r8192_priv *priv = ieee80211_priv(dev);

	u32 	reg_ratr = priv->rate_adaptive.last_ratr;
@@ -1963,7 +1959,7 @@ static void dm_bb_initialgain_restore(struct net_device *dev) 
}	// dm_BBInitialGainRestore





extern void dm_backup_dynamic_mechanism_state(struct net_device *dev)

void dm_backup_dynamic_mechanism_state(struct net_device *dev)

{

	struct r8192_priv *priv = ieee80211_priv(dev);
@@ -2018,9 +2014,7 @@ static void dm_bb_initialgain_backup(struct net_device *dev) 
 *	05/29/2008	amy		Create Version 0 porting from windows code.

 *

 *---------------------------------------------------------------------------*/

extern void dm_change_dynamic_initgain_thresh(struct net_device *dev,

								u32		dm_type,

								u32		dm_value)

void dm_change_dynamic_initgain_thresh(struct net_device *dev, u32 dm_type, u32	dm_value)

{

	if (dm_type == DIG_TYPE_THRESH_HIGH)

	{
@@ -2087,11 +2081,8 @@ extern void dm_change_dynamic_initgain_thresh(struct net_device *dev, 
		dm_digtable.rx_gain_range_max = (u8)dm_value;

	}

}	/* DM_ChangeDynamicInitGainThresh */

extern	void

dm_change_fsync_setting(

	struct net_device *dev,

	s32		DM_Type,

	s32		DM_Value)



static void dm_change_fsync_setting(struct net_device *dev, s32 DM_Type, s32 DM_Value)

{

	struct r8192_priv *priv = ieee80211_priv(dev);
@@ -2104,11 +2095,7 @@ dm_change_fsync_setting( 
	}

}



extern void

dm_change_rxpath_selection_setting(

	struct net_device *dev,

	s32		DM_Type,

	s32		DM_Value)

static void dm_change_rxpath_selection_setting(struct net_device *dev, s32 DM_Type, s32 DM_Value)

{

	struct r8192_priv *priv = ieee80211_priv(dev);

	prate_adaptive 	pRA = (prate_adaptive)&(priv->rate_adaptive);
@@ -2183,9 +2170,7 @@ dm_change_rxpath_selection_setting( 
}



#if 0

extern void dm_force_tx_fw_info(struct net_device *dev,

										u32		force_type,

										u32		force_value)

void dm_force_tx_fw_info(struct net_device *dev, u32 force_type, u32 force_value)

{

	struct r8192_priv *priv = ieee80211_priv(dev);
@@ -2832,7 +2817,7 @@ static void dm_cs_ratio( 
	}

}



extern void dm_init_edca_turbo(struct net_device * dev)

void dm_init_edca_turbo(struct net_device *dev)

{

	struct r8192_priv *priv = ieee80211_priv(dev);
@@ -2956,7 +2941,7 @@ static void dm_check_edca_turbo( 
}	// dm_CheckEdcaTurbo

#endif



extern void DM_CTSToSelfSetting(struct net_device * dev,u32 DM_Type, u32 DM_Value)

static void DM_CTSToSelfSetting(struct net_device *dev, u32 DM_Type, u32 DM_Value)

{

	struct r8192_priv *priv = ieee80211_priv((struct net_device *)dev);
@@ -3054,7 +3039,7 @@ static void dm_ctstoself(struct net_device *dev) 
 *	05/29/2008	amy		Create Version 0 porting from windows code.

 *

 *---------------------------------------------------------------------------*/

extern void dm_rf_operation_test_callback(unsigned long dev)

void dm_rf_operation_test_callback(unsigned long dev)

{

//	struct r8192_priv *priv = ieee80211_priv((struct net_device *)dev);

	u8 erfpath;
@@ -3215,7 +3200,7 @@ static void dm_check_pbc_gpio(struct net_device *dev) 
 *

 *---------------------------------------------------------------------------*/

#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))

extern	void	dm_gpio_change_rf_callback(struct work_struct *work)

void dm_gpio_change_rf_callback(struct work_struct *work)

{

	struct delayed_work *dwork = container_of(work,struct delayed_work,work);

       struct r8192_priv *priv = container_of(dwork,struct r8192_priv,gpio_change_rf_wq);
@@ -3291,7 +3276,7 @@ extern void dm_gpio_change_rf_callback(struct net_device *dev) 
 *

 *---------------------------------------------------------------------------*/

#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))

extern	void	dm_rf_pathcheck_workitemcallback(struct work_struct *work)

void dm_rf_pathcheck_workitemcallback(struct work_struct *work)

{

	struct delayed_work *dwork = container_of(work,struct delayed_work,work);

       struct r8192_priv *priv = container_of(dwork,struct r8192_priv,rfpath_check_wq);
@@ -3667,7 +3652,7 @@ static void dm_deInit_fsync(struct net_device *dev) 
	del_timer_sync(&priv->fsync_timer);

}



extern void dm_fsync_timer_callback(unsigned long data)

void dm_fsync_timer_callback(unsigned long data)

{

	struct net_device *dev = (struct net_device *)data;

	struct r8192_priv *priv = ieee80211_priv((struct net_device *)data);
@@ -4092,7 +4077,7 @@ extern s1Byte DM_CheckLBusStatus(IN PADAPTER Adapter) 
 *	05/29/2008	amy		Create Version 0 porting from windows code.

 *

 *---------------------------------------------------------------------------*/

extern void dm_shadow_init(struct net_device *dev)

void dm_shadow_init(struct net_device *dev)

{

	u8	page;

	u16	offset;

drivers/staging/rtl8192e/r8192E_wx.c

+2 −1
Original line number Diff line number Diff line
@@ -20,12 +20,13 @@ 
#include <linux/string.h>

#include "r8192E.h"

#include "r8192E_hw.h"

#include "r8192E_wx.h"

#ifdef ENABLE_DOT11D

#include "dot11d.h"

#endif



#define RATE_COUNT 12

u32 rtl8180_rates[] = {1000000,2000000,5500000,11000000,

static u32 rtl8180_rates[] = {1000000,2000000,5500000,11000000,

	6000000,9000000,12000000,18000000,24000000,36000000,48000000,54000000};