Commit 46326d26 authored by Teodora Baluta's avatar Teodora Baluta Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192u: fix sparse warnings for static functions 



Fix sparse warnings in static function in driver rtl8192u

Signed-off-by: default avatarTeodora Baluta <teobaluta@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4b31e1f8

drivers/staging/rtl8192u/ieee80211/ieee80211_module.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static int debug = \ 
			    //IEEE80211_DL_DATA	|

			    IEEE80211_DL_ERR	  //awayls open this flags to show error out

			    ;

struct proc_dir_entry *ieee80211_proc;

static struct proc_dir_entry *ieee80211_proc;



static int show_debug_level(struct seq_file *m, void *v)

{

drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -2166,7 +2166,7 @@ static inline u8 ieee80211_SignalStrengthTranslate( 
	return RetSS;

}



long ieee80211_translate_todbm(u8 signal_strength_index	)// 0-100 index.

static long ieee80211_translate_todbm(u8 signal_strength_index)// 0-100 index.

{

	long	signal_power; // in dBm.

drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c

+11 −5
Original line number Diff line number Diff line
@@ -303,7 +303,8 @@ ieee80211_classify(struct sk_buff *skb, struct ieee80211_network *network) 
}



#define SN_LESS(a, b)		(((a-b)&0x800)!=0)

void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee, struct sk_buff *skb, cb_desc *tcb_desc)

static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee,

				       struct sk_buff *skb, cb_desc *tcb_desc)

{

	PRT_HIGH_THROUGHPUT	pHTInfo = ieee->pHTInfo;

	PTX_TS_RECORD			pTxTs = NULL;
@@ -412,7 +413,8 @@ ieee80211_query_HTCapShortGI(struct ieee80211_device *ieee, cb_desc *tcb_desc) 
		tcb_desc->bUseShortGI = true;

}



void ieee80211_query_BandwidthMode(struct ieee80211_device *ieee, cb_desc *tcb_desc)

static void ieee80211_query_BandwidthMode(struct ieee80211_device *ieee,

					  cb_desc *tcb_desc)

{

	PRT_HIGH_THROUGHPUT	pHTInfo = ieee->pHTInfo;
@@ -432,7 +434,9 @@ void ieee80211_query_BandwidthMode(struct ieee80211_device *ieee, cb_desc *tcb_d 
	return;

}



void ieee80211_query_protectionmode(struct ieee80211_device *ieee, cb_desc *tcb_desc, struct sk_buff *skb)

static void ieee80211_query_protectionmode(struct ieee80211_device *ieee,

					   cb_desc *tcb_desc,

					   struct sk_buff *skb)

{

	// Common Settings

	tcb_desc->bRTSSTBC			= false;
@@ -543,7 +547,8 @@ void ieee80211_query_protectionmode(struct ieee80211_device *ieee, cb_desc *tcb_ 
}





void ieee80211_txrate_selectmode(struct ieee80211_device *ieee, cb_desc *tcb_desc)

static void ieee80211_txrate_selectmode(struct ieee80211_device *ieee,

					cb_desc *tcb_desc)

{

#ifdef TO_DO_LIST

	if(!IsDataFrame(pFrame))
@@ -573,7 +578,8 @@ void ieee80211_txrate_selectmode(struct ieee80211_device *ieee, cb_desc *tcb_des 
	}

}



void ieee80211_query_seqnum(struct ieee80211_device *ieee, struct sk_buff *skb, u8 *dst)

static void ieee80211_query_seqnum(struct ieee80211_device *ieee,

				   struct sk_buff *skb, u8 *dst)

{

	if (is_multicast_ether_addr(dst))

		return;

drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c

+4 −2
Original line number Diff line number Diff line
@@ -251,7 +251,8 @@ static struct sk_buff *ieee80211_DELBA( 
 *  output:  none

 *  notice: If any possible, please hide pBA in ieee. And temporarily use Manage Queue as softmac_mgmt_xmit() usually does

********************************************************************************************************************/

void ieee80211_send_ADDBAReq(struct ieee80211_device *ieee, u8 *dst, PBA_RECORD	pBA)

static void ieee80211_send_ADDBAReq(struct ieee80211_device *ieee,

				    u8 *dst, PBA_RECORD pBA)

{

	struct sk_buff *skb = NULL;

	skb = ieee80211_ADDBA(ieee, dst, pBA, 0, ACT_ADDBAREQ); //construct ACT_ADDBAREQ frames so set statuscode zero.
@@ -278,7 +279,8 @@ void ieee80211_send_ADDBAReq(struct ieee80211_device *ieee, u8 *dst, PBA_RECORD 
 *  output:  none

 *  notice: If any possible, please hide pBA in ieee. And temporarily use Manage Queue as softmac_mgmt_xmit() usually does

********************************************************************************************************************/

void ieee80211_send_ADDBARsp(struct ieee80211_device *ieee, u8 *dst, PBA_RECORD pBA, u16 StatusCode)

static void ieee80211_send_ADDBARsp(struct ieee80211_device *ieee, u8 *dst,

				    PBA_RECORD pBA, u16 StatusCode)

{

	struct sk_buff *skb = NULL;

	skb = ieee80211_ADDBA(ieee, dst, pBA, StatusCode, ACT_ADDBARSP); //construct ACT_ADDBARSP frames

drivers/staging/rtl8192u/r8192U_core.c

+29 −24
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ int read_nic_word(struct net_device *dev, int indx, u16 *data) 
	return 0;

}



int read_nic_word_E(struct net_device *dev, int indx, u16 *data)

static int read_nic_word_E(struct net_device *dev, int indx, u16 *data)

{

	int status;

	struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
@@ -585,7 +585,7 @@ static int proc_get_stats_rx(struct seq_file *m, void *v) 
	return 0;

}



void rtl8192_proc_module_init(void)

static void rtl8192_proc_module_init(void)

{

	RT_TRACE(COMP_INIT, "Initializing proc filesystem");

	rtl8192_proc = proc_mkdir(RTL819xU_MODULE_NAME, init_net.proc_net);
@@ -631,7 +631,7 @@ static const struct rtl8192_proc_file rtl8192_proc_files[] = { 
	{ "" }

};



void rtl8192_proc_init_one(struct net_device *dev)

static void rtl8192_proc_init_one(struct net_device *dev)

{

	const struct rtl8192_proc_file *f;

	struct proc_dir_entry *dir;
@@ -656,7 +656,7 @@ void rtl8192_proc_init_one(struct net_device *dev) 
	}

}



void rtl8192_proc_remove_one(struct net_device *dev)

static void rtl8192_proc_remove_one(struct net_device *dev)

{

	remove_proc_subtree(dev->name, rtl8192_proc);

}
@@ -755,7 +755,7 @@ void rtl8192_set_chan(struct net_device *dev, short ch) 


static void rtl8192_rx_isr(struct urb *urb);



u32 get_rxpacket_shiftbytes_819xusb(struct ieee80211_rx_stats *pstats)

static u32 get_rxpacket_shiftbytes_819xusb(struct ieee80211_rx_stats *pstats)

{



#ifdef USB_RX_AGGREGATION_SUPPORT
@@ -998,7 +998,7 @@ static void rtl8192_rx_isr(struct urb *urb) 
		netdev_err(dev, "can not submit rxurb, err is %x, URB status is %x\n", err, urb->status);

}



u32 rtl819xusb_rx_command_packet(struct net_device *dev,

static u32 rtl819xusb_rx_command_packet(struct net_device *dev,

					struct ieee80211_rx_stats *pstats)

{

	u32	status;
@@ -1629,7 +1629,7 @@ short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb) 
 *

 * \param QUEUEID       Software Queue

*/

u8 MapHwQueueToFirmwareQueue(u8 QueueID)

static u8 MapHwQueueToFirmwareQueue(u8 QueueID)

{

	u8 QueueSelect = 0x0;       //defualt set to
@@ -1716,7 +1716,7 @@ u8 MRateToHwRate8190Pci(u8 rate) 
}





u8 QueryIsShort(u8 TxHT, u8 TxRate, cb_desc *tcb_desc)

static u8 QueryIsShort(u8 TxHT, u8 TxRate, cb_desc *tcb_desc)

{

	u8   tmp_Short;
@@ -1927,7 +1927,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb) 
	}

}



short rtl8192_usb_initendpoints(struct net_device *dev)

static short rtl8192_usb_initendpoints(struct net_device *dev)

{

	struct r8192_priv *priv = ieee80211_priv(dev);
@@ -1985,7 +1985,7 @@ short rtl8192_usb_initendpoints(struct net_device *dev) 


}

#ifdef THOMAS_BEACON

void rtl8192_usb_deleteendpoints(struct net_device *dev)

static void rtl8192_usb_deleteendpoints(struct net_device *dev)

{

	int i;

	struct r8192_priv *priv = ieee80211_priv(dev);
@@ -2285,7 +2285,7 @@ void rtl8192_update_ratr_table(struct net_device *dev) 


static u8 ccmp_ie[4] = {0x00, 0x50, 0xf2, 0x04};

static u8 ccmp_rsn_ie[4] = {0x00, 0x0f, 0xac, 0x04};

bool GetNmodeSupportBySecCfg8192(struct net_device *dev)

static bool GetNmodeSupportBySecCfg8192(struct net_device *dev)

{

	struct r8192_priv *priv = ieee80211_priv(dev);

	struct ieee80211_device *ieee = priv->ieee80211;
@@ -3160,7 +3160,7 @@ static struct net_device_stats *rtl8192_stats(struct net_device *dev) 
	return &priv->ieee80211->stats;

}



bool HalTxCheckStuck819xUsb(struct net_device *dev)

static bool HalTxCheckStuck819xUsb(struct net_device *dev)

{

	struct r8192_priv *priv = ieee80211_priv(dev);

	u16		RegTxCounter;
@@ -3210,7 +3210,7 @@ RESET_TYPE TxCheckStuck(struct net_device *dev) 
	return RESET_TYPE_NORESET;

}



bool HalRxCheckStuck819xUsb(struct net_device *dev)

static bool HalRxCheckStuck819xUsb(struct net_device *dev)

{

	u16	RegRxCounter;

	struct r8192_priv *priv = ieee80211_priv(dev);
@@ -3252,7 +3252,7 @@ bool HalRxCheckStuck819xUsb(struct net_device *dev) 
	return bStuck;

}



RESET_TYPE RxCheckStuck(struct net_device *dev)

static RESET_TYPE RxCheckStuck(struct net_device *dev)

{

	struct r8192_priv *priv = ieee80211_priv(dev);

	bool        bRxCheck = FALSE;
@@ -3936,7 +3936,8 @@ u8 HwRateToMRate90(bool bIsHT, u8 rate) 
 * Return:

 *               None

 */

void UpdateRxPktTimeStamp8190(struct net_device *dev, struct ieee80211_rx_stats *stats)

static void UpdateRxPktTimeStamp8190(struct net_device *dev,

				     struct ieee80211_rx_stats *stats)

{

	struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
@@ -4193,7 +4194,7 @@ static u8 rtl819x_evm_dbtopercentage(char value) 
//	We want good-looking for signal strength/quality

//	2007/7/19 01:09, by cosa.

//

long rtl819x_signal_scale_mapping(long currsig)

static long rtl819x_signal_scale_mapping(long currsig)

{

	long retsig;
@@ -4462,7 +4463,7 @@ void rtl8192_record_rxdesc_forlateruse(struct ieee80211_rx_stats *psrc_stats, 
}





void TranslateRxSignalStuff819xUsb(struct sk_buff *skb,

static void TranslateRxSignalStuff819xUsb(struct sk_buff *skb,

					  struct ieee80211_rx_stats *pstats,

					  rx_drvinfo_819x_usb  *pdrvinfo)

{
@@ -4533,7 +4534,8 @@ void TranslateRxSignalStuff819xUsb(struct sk_buff *skb, 
* Return:

*		None

*/

void UpdateReceivedRateHistogramStatistics8190(struct net_device *dev,

static void

UpdateReceivedRateHistogramStatistics8190(struct net_device *dev,

					  struct ieee80211_rx_stats *stats)

{

	struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
@@ -4598,7 +4600,9 @@ void UpdateReceivedRateHistogramStatistics8190(struct net_device *dev, 
}





void query_rxdesc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats, bool bIsRxAggrSubframe)

static void query_rxdesc_status(struct sk_buff *skb,

				struct ieee80211_rx_stats *stats,

				bool bIsRxAggrSubframe)

{

	rtl8192_rx_info *info = (struct rtl8192_rx_info *)skb->cb;

	struct net_device *dev = info->dev;
@@ -4914,7 +4918,8 @@ void rtl819xusb_process_received_packet(struct net_device *dev, 


}



void query_rx_cmdpkt_desc_status(struct sk_buff *skb, struct ieee80211_rx_stats *stats)

static void query_rx_cmdpkt_desc_status(struct sk_buff *skb,

					struct ieee80211_rx_stats *stats)

{

	rx_desc_819x_usb *desc = (rx_desc_819x_usb *)skb->data;