diff options
author | Ana Rey <anarey@gmail.com> | 2014-03-19 06:54:53 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-19 12:30:01 -0400 |
commit | bf316434ae8e3ef715ff86fd402454ae3ec758bd (patch) | |
tree | f2a8a33a9dafc89e232540e45dd860338f48b792 | |
parent | 5cd3b24908ab2a35d09ddb4de3444e74c43c4c30 (diff) |
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>
-rw-r--r-- | drivers/staging/rtl8192u/r8192U_dm.c | 51 |
1 files changed, 10 insertions, 41 deletions
diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c index c3205ad218dd..d97ad7b909bc 100644 --- a/drivers/staging/rtl8192u/r8192U_dm.c +++ b/drivers/staging/rtl8192u/r8192U_dm.c | |||
@@ -50,34 +50,7 @@ DRxPathSel DM_RxPathSelTable; | |||
50 | 50 | ||
51 | 51 | ||
52 | /*--------------------Define export function prototype-----------------------*/ | 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 | extern void dm_check_fsync(struct net_device *dev); | 53 | extern void dm_check_fsync(struct net_device *dev); |
79 | extern void dm_shadow_init(struct net_device *dev); | ||
80 | |||
81 | 54 | ||
82 | /*--------------------Define export function prototype-----------------------*/ | 55 | /*--------------------Define export function prototype-----------------------*/ |
83 | 56 | ||
@@ -155,8 +128,7 @@ static void dm_ctstoself(struct net_device *dev); | |||
155 | // This function is only invoked at driver intialization once. | 128 | // This function is only invoked at driver intialization once. |
156 | // | 129 | // |
157 | // | 130 | // |
158 | void | 131 | void init_hal_dm(struct net_device *dev) |
159 | init_hal_dm(struct net_device *dev) | ||
160 | { | 132 | { |
161 | struct r8192_priv *priv = ieee80211_priv(dev); | 133 | struct r8192_priv *priv = ieee80211_priv(dev); |
162 | 134 | ||
@@ -242,7 +214,7 @@ void dm_CheckRxAggregation(struct net_device *dev) { | |||
242 | 214 | ||
243 | 215 | ||
244 | 216 | ||
245 | void hal_dm_watchdog(struct net_device *dev) | 217 | void hal_dm_watchdog(struct net_device *dev) |
246 | { | 218 | { |
247 | //struct r8192_priv *priv = ieee80211_priv(dev); | 219 | //struct r8192_priv *priv = ieee80211_priv(dev); |
248 | 220 | ||
@@ -875,7 +847,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev) | |||
875 | priv->txpower_count = 0; | 847 | priv->txpower_count = 0; |
876 | } | 848 | } |
877 | 849 | ||
878 | void dm_txpower_trackingcallback(struct work_struct *work) | 850 | void dm_txpower_trackingcallback(struct work_struct *work) |
879 | { | 851 | { |
880 | struct delayed_work *dwork = container_of(work,struct delayed_work,work); | 852 | struct delayed_work *dwork = container_of(work,struct delayed_work,work); |
881 | struct r8192_priv *priv = container_of(dwork,struct r8192_priv,txpower_tracking_wq); | 853 | struct r8192_priv *priv = container_of(dwork,struct r8192_priv,txpower_tracking_wq); |
@@ -1606,10 +1578,7 @@ static void dm_CCKTxPowerAdjust_ThermalMeter(struct net_device *dev, bool bInCH | |||
1606 | 1578 | ||
1607 | 1579 | ||
1608 | 1580 | ||
1609 | void dm_cck_txpower_adjust( | 1581 | void dm_cck_txpower_adjust(struct net_device *dev, bool binch14) |
1610 | struct net_device *dev, | ||
1611 | bool binch14 | ||
1612 | ) | ||
1613 | { // dm_CCKTxPowerAdjust | 1582 | { // dm_CCKTxPowerAdjust |
1614 | 1583 | ||
1615 | struct r8192_priv *priv = ieee80211_priv(dev); | 1584 | struct r8192_priv *priv = ieee80211_priv(dev); |
@@ -1642,7 +1611,7 @@ static void dm_txpower_reset_recovery( | |||
1642 | 1611 | ||
1643 | } // dm_TXPowerResetRecovery | 1612 | } // dm_TXPowerResetRecovery |
1644 | 1613 | ||
1645 | extern void dm_restore_dynamic_mechanism_state(struct net_device *dev) | 1614 | void dm_restore_dynamic_mechanism_state(struct net_device *dev) |
1646 | { | 1615 | { |
1647 | struct r8192_priv *priv = ieee80211_priv(dev); | 1616 | struct r8192_priv *priv = ieee80211_priv(dev); |
1648 | u32 reg_ratr = priv->rate_adaptive.last_ratr; | 1617 | u32 reg_ratr = priv->rate_adaptive.last_ratr; |
@@ -1718,7 +1687,7 @@ static void dm_bb_initialgain_restore(struct net_device *dev) | |||
1718 | } // dm_BBInitialGainRestore | 1687 | } // dm_BBInitialGainRestore |
1719 | 1688 | ||
1720 | 1689 | ||
1721 | extern void dm_backup_dynamic_mechanism_state(struct net_device *dev) | 1690 | void dm_backup_dynamic_mechanism_state(struct net_device *dev) |
1722 | { | 1691 | { |
1723 | struct r8192_priv *priv = ieee80211_priv(dev); | 1692 | struct r8192_priv *priv = ieee80211_priv(dev); |
1724 | 1693 | ||
@@ -1773,9 +1742,9 @@ static void dm_bb_initialgain_backup(struct net_device *dev) | |||
1773 | * 05/29/2008 amy Create Version 0 porting from windows code. | 1742 | * 05/29/2008 amy Create Version 0 porting from windows code. |
1774 | * | 1743 | * |
1775 | *---------------------------------------------------------------------------*/ | 1744 | *---------------------------------------------------------------------------*/ |
1776 | void dm_change_dynamic_initgain_thresh(struct net_device *dev, | 1745 | |
1777 | u32 dm_type, | 1746 | void dm_change_dynamic_initgain_thresh(struct net_device *dev, u32 dm_type, |
1778 | u32 dm_value) | 1747 | u32 dm_value) |
1779 | { | 1748 | { |
1780 | if (dm_type == DIG_TYPE_THRESH_HIGH) | 1749 | if (dm_type == DIG_TYPE_THRESH_HIGH) |
1781 | { | 1750 | { |
@@ -2743,7 +2712,7 @@ static void dm_check_pbc_gpio(struct net_device *dev) | |||
2743 | * 01/30/2008 MHC Create Version 0. | 2712 | * 01/30/2008 MHC Create Version 0. |
2744 | * | 2713 | * |
2745 | *---------------------------------------------------------------------------*/ | 2714 | *---------------------------------------------------------------------------*/ |
2746 | void dm_rf_pathcheck_workitemcallback(struct work_struct *work) | 2715 | void dm_rf_pathcheck_workitemcallback(struct work_struct *work) |
2747 | { | 2716 | { |
2748 | struct delayed_work *dwork = container_of(work,struct delayed_work,work); | 2717 | struct delayed_work *dwork = container_of(work,struct delayed_work,work); |
2749 | struct r8192_priv *priv = container_of(dwork,struct r8192_priv,rfpath_check_wq); | 2718 | struct r8192_priv *priv = container_of(dwork,struct r8192_priv,rfpath_check_wq); |