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

Commit bf316434 authored by Ana Rey's avatar Ana Rey Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192u: Delete duplicate function declarations and extern keyword 



Delete the duplicate function declarations in r8192U_dm.c.

These function declarations are defined in r8192U_dm.h.

Also, delete the 'extern' keyword of these function definitions.

Fix the following sparse warnings:

  CHECK   drivers/staging/rtl8192u/r8192U_dm.c
drivers/staging/rtl8192u/r8192U_dm.c:159:1: warning: function 'init_hal_dm' with external linkage has definition
drivers/staging/rtl8192u/r8192U_dm.c:179:13: warning: function 'deinit_hal_dm' with external linkage has definition
drivers/staging/rtl8192u/r8192U_dm.c:245:17: warning: function 'hal_dm_watchdog' with external linkage has definition
drivers/staging/rtl8192u/r8192U_dm.c:278:13: warning: function 'init_rate_adaptive' with external linkage has definition
drivers/staging/rtl8192u/r8192U_dm.c:878:17: warning: function 'dm_txpower_trackingcallback' with external linkage has definition
drivers/staging/rtl8192u/r8192U_dm.c:1609:13: warning: function 'dm_cck_txpower_adjust' with external linkage has definition
drivers/staging/rtl8192u/r8192U_dm.c:1776:13: warning: function 'dm_change_dynamic_initgain_thresh' with external linkage has definition
drivers/staging/rtl8192u/r8192U_dm.c:2543:13: warning: function 'dm_init_edca_turbo' with external linkage has definition
drivers/staging/rtl8192u/r8192U_dm.c:2782:17: warning: function 'dm_rf_pathcheck_workitemcallback' with external linkage has definition
drivers/staging/rtl8192u/r8192U_dm.c:3142:13: warning: function 'dm_fsync_timer_callback' with external linkage has definition
drivers/staging/rtl8192u/r8192U_dm.c:3481:13: warning: function 'dm_shadow_init' with external linkage has definition

Signed-off-by: default avatarAna Rey <anarey@gmail.com>
Acked-by: default avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5cd3b249

drivers/staging/rtl8192u/r8192U_dm.c

+10 −41
Original line number Diff line number Diff line
@@ -50,34 +50,7 @@ DRxPathSel DM_RxPathSelTable; 




/*--------------------Define export function prototype-----------------------*/

extern	void	init_hal_dm(struct net_device *dev);

extern	void deinit_hal_dm(struct net_device *dev);



extern void hal_dm_watchdog(struct net_device *dev);





extern	void	init_rate_adaptive(struct net_device *dev);

extern	void	dm_txpower_trackingcallback(struct work_struct *work);



extern	void	dm_cck_txpower_adjust(struct net_device *dev,bool  binch14);

extern	void	dm_restore_dynamic_mechanism_state(struct net_device *dev);

extern	void	dm_backup_dynamic_mechanism_state(struct net_device *dev);

extern	void	dm_change_dynamic_initgain_thresh(struct net_device *dev,

								u32		dm_type,

								u32		dm_value);

extern	void	DM_ChangeFsyncSetting(struct net_device *dev,

												s32		DM_Type,

												s32		DM_Value);

extern	void dm_force_tx_fw_info(struct net_device *dev,

										u32		force_type,

										u32		force_value);

extern	void	dm_init_edca_turbo(struct net_device *dev);

extern	void	dm_rf_operation_test_callback(unsigned long data);

extern	void	dm_rf_pathcheck_workitemcallback(struct work_struct *work);

extern	void dm_fsync_timer_callback(unsigned long data);

extern	void dm_check_fsync(struct net_device *dev);

extern	void	dm_shadow_init(struct net_device *dev);





/*--------------------Define export function prototype-----------------------*/
@@ -155,8 +128,7 @@ static void dm_ctstoself(struct net_device *dev); 
//		This function is only invoked at driver intialization once.

//

//

void

init_hal_dm(struct net_device *dev)

void init_hal_dm(struct net_device *dev)

{

	struct r8192_priv *priv = ieee80211_priv(dev);
@@ -1606,10 +1578,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH 






void dm_cck_txpower_adjust(

	struct net_device *dev,

	bool  binch14

)

void dm_cck_txpower_adjust(struct net_device *dev, bool binch14)

{	// dm_CCKTxPowerAdjust



	struct r8192_priv *priv = ieee80211_priv(dev);
@@ -1642,7 +1611,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;
@@ -1718,7 +1687,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);
@@ -1773,8 +1742,8 @@ static void dm_bb_initialgain_backup(struct net_device *dev) 
 *	05/29/2008	amy		Create Version 0 porting from windows code.

 *

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

void dm_change_dynamic_initgain_thresh(struct net_device *dev,

								u32		dm_type,



void dm_change_dynamic_initgain_thresh(struct net_device *dev, u32 dm_type,

				       u32 dm_value)

{

	if (dm_type == DIG_TYPE_THRESH_HIGH)