diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-01-20 19:39:42 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-01-30 20:35:31 -0500 |
commit | a73e22b286bd162d10526521b34f2d6f37aac635 (patch) | |
tree | 728562af8aa42a145cf9b591382b044a31e94fb4 /drivers/net/wireless/ipw2200.c | |
parent | 3c398b8612b210a159ec7ba5e5c3c341fb0d5eab (diff) |
[PATCH] drivers/net/wireless/ipw2200: possible cleanups
This patch contains the following possible cleanups:
- make needlessly global functions static
- "extern inline" -> "static inline"
- #if 0 the unused global function ipw_led_activity_on()
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 916b24c544e2..2a834deb60e8 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -701,7 +701,7 @@ static void ipw_init_ordinals(struct ipw_priv *priv) | |||
701 | 701 | ||
702 | } | 702 | } |
703 | 703 | ||
704 | u32 ipw_register_toggle(u32 reg) | 704 | static u32 ipw_register_toggle(u32 reg) |
705 | { | 705 | { |
706 | reg &= ~IPW_START_STANDBY; | 706 | reg &= ~IPW_START_STANDBY; |
707 | if (reg & IPW_GATE_ODMA) | 707 | if (reg & IPW_GATE_ODMA) |
@@ -726,7 +726,7 @@ u32 ipw_register_toggle(u32 reg) | |||
726 | #define LD_TIME_LINK_OFF 2700 | 726 | #define LD_TIME_LINK_OFF 2700 |
727 | #define LD_TIME_ACT_ON 250 | 727 | #define LD_TIME_ACT_ON 250 |
728 | 728 | ||
729 | void ipw_led_link_on(struct ipw_priv *priv) | 729 | static void ipw_led_link_on(struct ipw_priv *priv) |
730 | { | 730 | { |
731 | unsigned long flags; | 731 | unsigned long flags; |
732 | u32 led; | 732 | u32 led; |
@@ -769,7 +769,7 @@ static void ipw_bg_led_link_on(void *data) | |||
769 | up(&priv->sem); | 769 | up(&priv->sem); |
770 | } | 770 | } |
771 | 771 | ||
772 | void ipw_led_link_off(struct ipw_priv *priv) | 772 | static void ipw_led_link_off(struct ipw_priv *priv) |
773 | { | 773 | { |
774 | unsigned long flags; | 774 | unsigned long flags; |
775 | u32 led; | 775 | u32 led; |
@@ -847,6 +847,7 @@ static void __ipw_led_activity_on(struct ipw_priv *priv) | |||
847 | } | 847 | } |
848 | } | 848 | } |
849 | 849 | ||
850 | #if 0 | ||
850 | void ipw_led_activity_on(struct ipw_priv *priv) | 851 | void ipw_led_activity_on(struct ipw_priv *priv) |
851 | { | 852 | { |
852 | unsigned long flags; | 853 | unsigned long flags; |
@@ -854,8 +855,9 @@ void ipw_led_activity_on(struct ipw_priv *priv) | |||
854 | __ipw_led_activity_on(priv); | 855 | __ipw_led_activity_on(priv); |
855 | spin_unlock_irqrestore(&priv->lock, flags); | 856 | spin_unlock_irqrestore(&priv->lock, flags); |
856 | } | 857 | } |
858 | #endif /* 0 */ | ||
857 | 859 | ||
858 | void ipw_led_activity_off(struct ipw_priv *priv) | 860 | static void ipw_led_activity_off(struct ipw_priv *priv) |
859 | { | 861 | { |
860 | unsigned long flags; | 862 | unsigned long flags; |
861 | u32 led; | 863 | u32 led; |
@@ -890,7 +892,7 @@ static void ipw_bg_led_activity_off(void *data) | |||
890 | up(&priv->sem); | 892 | up(&priv->sem); |
891 | } | 893 | } |
892 | 894 | ||
893 | void ipw_led_band_on(struct ipw_priv *priv) | 895 | static void ipw_led_band_on(struct ipw_priv *priv) |
894 | { | 896 | { |
895 | unsigned long flags; | 897 | unsigned long flags; |
896 | u32 led; | 898 | u32 led; |
@@ -925,7 +927,7 @@ void ipw_led_band_on(struct ipw_priv *priv) | |||
925 | spin_unlock_irqrestore(&priv->lock, flags); | 927 | spin_unlock_irqrestore(&priv->lock, flags); |
926 | } | 928 | } |
927 | 929 | ||
928 | void ipw_led_band_off(struct ipw_priv *priv) | 930 | static void ipw_led_band_off(struct ipw_priv *priv) |
929 | { | 931 | { |
930 | unsigned long flags; | 932 | unsigned long flags; |
931 | u32 led; | 933 | u32 led; |
@@ -948,24 +950,24 @@ void ipw_led_band_off(struct ipw_priv *priv) | |||
948 | spin_unlock_irqrestore(&priv->lock, flags); | 950 | spin_unlock_irqrestore(&priv->lock, flags); |
949 | } | 951 | } |
950 | 952 | ||
951 | void ipw_led_radio_on(struct ipw_priv *priv) | 953 | static void ipw_led_radio_on(struct ipw_priv *priv) |
952 | { | 954 | { |
953 | ipw_led_link_on(priv); | 955 | ipw_led_link_on(priv); |
954 | } | 956 | } |
955 | 957 | ||
956 | void ipw_led_radio_off(struct ipw_priv *priv) | 958 | static void ipw_led_radio_off(struct ipw_priv *priv) |
957 | { | 959 | { |
958 | ipw_led_activity_off(priv); | 960 | ipw_led_activity_off(priv); |
959 | ipw_led_link_off(priv); | 961 | ipw_led_link_off(priv); |
960 | } | 962 | } |
961 | 963 | ||
962 | void ipw_led_link_up(struct ipw_priv *priv) | 964 | static void ipw_led_link_up(struct ipw_priv *priv) |
963 | { | 965 | { |
964 | /* Set the Link Led on for all nic types */ | 966 | /* Set the Link Led on for all nic types */ |
965 | ipw_led_link_on(priv); | 967 | ipw_led_link_on(priv); |
966 | } | 968 | } |
967 | 969 | ||
968 | void ipw_led_link_down(struct ipw_priv *priv) | 970 | static void ipw_led_link_down(struct ipw_priv *priv) |
969 | { | 971 | { |
970 | ipw_led_activity_off(priv); | 972 | ipw_led_activity_off(priv); |
971 | ipw_led_link_off(priv); | 973 | ipw_led_link_off(priv); |
@@ -974,7 +976,7 @@ void ipw_led_link_down(struct ipw_priv *priv) | |||
974 | ipw_led_radio_off(priv); | 976 | ipw_led_radio_off(priv); |
975 | } | 977 | } |
976 | 978 | ||
977 | void ipw_led_init(struct ipw_priv *priv) | 979 | static void ipw_led_init(struct ipw_priv *priv) |
978 | { | 980 | { |
979 | priv->nic_type = priv->eeprom[EEPROM_NIC_TYPE]; | 981 | priv->nic_type = priv->eeprom[EEPROM_NIC_TYPE]; |
980 | 982 | ||
@@ -1025,7 +1027,7 @@ void ipw_led_init(struct ipw_priv *priv) | |||
1025 | } | 1027 | } |
1026 | } | 1028 | } |
1027 | 1029 | ||
1028 | void ipw_led_shutdown(struct ipw_priv *priv) | 1030 | static void ipw_led_shutdown(struct ipw_priv *priv) |
1029 | { | 1031 | { |
1030 | ipw_led_activity_off(priv); | 1032 | ipw_led_activity_off(priv); |
1031 | ipw_led_link_off(priv); | 1033 | ipw_led_link_off(priv); |
@@ -6204,7 +6206,8 @@ static int ipw_wpa_set_auth_algs(struct ipw_priv *priv, int value) | |||
6204 | return ret; | 6206 | return ret; |
6205 | } | 6207 | } |
6206 | 6208 | ||
6207 | void ipw_wpa_assoc_frame(struct ipw_priv *priv, char *wpa_ie, int wpa_ie_len) | 6209 | static void ipw_wpa_assoc_frame(struct ipw_priv *priv, char *wpa_ie, |
6210 | int wpa_ie_len) | ||
6208 | { | 6211 | { |
6209 | /* make sure WPA is enabled */ | 6212 | /* make sure WPA is enabled */ |
6210 | ipw_wpa_enable(priv, 1); | 6213 | ipw_wpa_enable(priv, 1); |
@@ -10059,7 +10062,7 @@ static void ipw_bg_rf_kill(void *data) | |||
10059 | up(&priv->sem); | 10062 | up(&priv->sem); |
10060 | } | 10063 | } |
10061 | 10064 | ||
10062 | void ipw_link_up(struct ipw_priv *priv) | 10065 | static void ipw_link_up(struct ipw_priv *priv) |
10063 | { | 10066 | { |
10064 | priv->last_seq_num = -1; | 10067 | priv->last_seq_num = -1; |
10065 | priv->last_frag_num = -1; | 10068 | priv->last_frag_num = -1; |
@@ -10094,7 +10097,7 @@ static void ipw_bg_link_up(void *data) | |||
10094 | up(&priv->sem); | 10097 | up(&priv->sem); |
10095 | } | 10098 | } |
10096 | 10099 | ||
10097 | void ipw_link_down(struct ipw_priv *priv) | 10100 | static void ipw_link_down(struct ipw_priv *priv) |
10098 | { | 10101 | { |
10099 | ipw_led_link_down(priv); | 10102 | ipw_led_link_down(priv); |
10100 | netif_carrier_off(priv->net_dev); | 10103 | netif_carrier_off(priv->net_dev); |