Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Ana Rey <anarey@gmail.com>
Acked-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Ana Rey and committed by
Greg Kroah-Hartman
bf316434 5cd3b249

+10 -41
+10 -41
drivers/staging/rtl8192u/r8192U_dm.c
··· 50 50 51 51 52 52 /*--------------------Define export function prototype-----------------------*/ 53 - extern void init_hal_dm(struct net_device *dev); 54 - extern void deinit_hal_dm(struct net_device *dev); 55 - 56 - extern void hal_dm_watchdog(struct net_device *dev); 57 - 58 - 59 - extern void init_rate_adaptive(struct net_device *dev); 60 - extern void dm_txpower_trackingcallback(struct work_struct *work); 61 - 62 - extern void dm_cck_txpower_adjust(struct net_device *dev,bool binch14); 63 - extern void dm_restore_dynamic_mechanism_state(struct net_device *dev); 64 - extern void dm_backup_dynamic_mechanism_state(struct net_device *dev); 65 - extern void dm_change_dynamic_initgain_thresh(struct net_device *dev, 66 - u32 dm_type, 67 - u32 dm_value); 68 - extern void DM_ChangeFsyncSetting(struct net_device *dev, 69 - s32 DM_Type, 70 - s32 DM_Value); 71 - extern void dm_force_tx_fw_info(struct net_device *dev, 72 - u32 force_type, 73 - u32 force_value); 74 - extern void dm_init_edca_turbo(struct net_device *dev); 75 - extern void dm_rf_operation_test_callback(unsigned long data); 76 - extern void dm_rf_pathcheck_workitemcallback(struct work_struct *work); 77 - extern void dm_fsync_timer_callback(unsigned long data); 78 53 extern void dm_check_fsync(struct net_device *dev); 79 - extern void dm_shadow_init(struct net_device *dev); 80 - 81 54 82 55 /*--------------------Define export function prototype-----------------------*/ 83 56 ··· 128 155 // This function is only invoked at driver intialization once. 129 156 // 130 157 // 131 - void 132 - init_hal_dm(struct net_device *dev) 158 + void init_hal_dm(struct net_device *dev) 133 159 { 134 160 struct r8192_priv *priv = ieee80211_priv(dev); 135 161 ··· 214 242 215 243 216 244 217 - void hal_dm_watchdog(struct net_device *dev) 245 + void hal_dm_watchdog(struct net_device *dev) 218 246 { 219 247 //struct r8192_priv *priv = ieee80211_priv(dev); 220 248 ··· 847 875 priv->txpower_count = 0; 848 876 } 849 877 850 - void dm_txpower_trackingcallback(struct work_struct *work) 878 + void dm_txpower_trackingcallback(struct work_struct *work) 851 879 { 852 880 struct delayed_work *dwork = container_of(work,struct delayed_work,work); 853 881 struct r8192_priv *priv = container_of(dwork,struct r8192_priv,txpower_tracking_wq); ··· 1578 1606 1579 1607 1580 1608 1581 - void dm_cck_txpower_adjust( 1582 - struct net_device *dev, 1583 - bool binch14 1584 - ) 1609 + void dm_cck_txpower_adjust(struct net_device *dev, bool binch14) 1585 1610 { // dm_CCKTxPowerAdjust 1586 1611 1587 1612 struct r8192_priv *priv = ieee80211_priv(dev); ··· 1611 1642 1612 1643 } // dm_TXPowerResetRecovery 1613 1644 1614 - extern void dm_restore_dynamic_mechanism_state(struct net_device *dev) 1645 + void dm_restore_dynamic_mechanism_state(struct net_device *dev) 1615 1646 { 1616 1647 struct r8192_priv *priv = ieee80211_priv(dev); 1617 1648 u32 reg_ratr = priv->rate_adaptive.last_ratr; ··· 1687 1718 } // dm_BBInitialGainRestore 1688 1719 1689 1720 1690 - extern void dm_backup_dynamic_mechanism_state(struct net_device *dev) 1721 + void dm_backup_dynamic_mechanism_state(struct net_device *dev) 1691 1722 { 1692 1723 struct r8192_priv *priv = ieee80211_priv(dev); 1693 1724 ··· 1742 1773 * 05/29/2008 amy Create Version 0 porting from windows code. 1743 1774 * 1744 1775 *---------------------------------------------------------------------------*/ 1745 - void dm_change_dynamic_initgain_thresh(struct net_device *dev, 1746 - u32 dm_type, 1747 - u32 dm_value) 1776 + 1777 + void dm_change_dynamic_initgain_thresh(struct net_device *dev, u32 dm_type, 1778 + u32 dm_value) 1748 1779 { 1749 1780 if (dm_type == DIG_TYPE_THRESH_HIGH) 1750 1781 { ··· 2712 2743 * 01/30/2008 MHC Create Version 0. 2713 2744 * 2714 2745 *---------------------------------------------------------------------------*/ 2715 - void dm_rf_pathcheck_workitemcallback(struct work_struct *work) 2746 + void dm_rf_pathcheck_workitemcallback(struct work_struct *work) 2716 2747 { 2717 2748 struct delayed_work *dwork = container_of(work,struct delayed_work,work); 2718 2749 struct r8192_priv *priv = container_of(dwork,struct r8192_priv,rfpath_check_wq);