diff options
author | Felipe Balbi <balbi@ti.com> | 2011-10-06 03:46:20 -0400 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2011-10-11 09:01:14 -0400 |
commit | 4b32a2c9a636eaab69c797d9ebc7e086a6bd2fb7 (patch) | |
tree | 6ee6ddad97aa541bf65a9d9daa529dd4646b4887 | |
parent | a390e85cfe91c346ff4745bcd45ad0a7e7101aa2 (diff) |
wl12xx: mark some symbols static
after re-factoring a bunch of symbols are only
used inside main.c which allows us to mark
them as static.
Signed-off-by: Felipe Balbi <balbi@ti.com>
[forward-ported]
Signed-off-by: Luciano Coelho <coelho@ti.com>
-rw-r--r-- | drivers/net/wireless/wl12xx/io.h | 9 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 18 |
2 files changed, 8 insertions, 19 deletions
diff --git a/drivers/net/wireless/wl12xx/io.h b/drivers/net/wireless/wl12xx/io.h index e82dad19aa30..d398cbcea986 100644 --- a/drivers/net/wireless/wl12xx/io.h +++ b/drivers/net/wireless/wl12xx/io.h | |||
@@ -170,15 +170,10 @@ u16 wl1271_top_reg_read(struct wl1271 *wl, int addr); | |||
170 | int wl1271_set_partition(struct wl1271 *wl, | 170 | int wl1271_set_partition(struct wl1271 *wl, |
171 | struct wl1271_partition_set *p); | 171 | struct wl1271_partition_set *p); |
172 | 172 | ||
173 | bool wl1271_set_block_size(struct wl1271 *wl); | ||
174 | |||
173 | /* Functions from wl1271_main.c */ | 175 | /* Functions from wl1271_main.c */ |
174 | 176 | ||
175 | int wl1271_register_hw(struct wl1271 *wl); | ||
176 | void wl1271_unregister_hw(struct wl1271 *wl); | ||
177 | int wl1271_init_ieee80211(struct wl1271 *wl); | ||
178 | struct ieee80211_hw *wl1271_alloc_hw(void); | ||
179 | int wl1271_free_hw(struct wl1271 *wl); | ||
180 | irqreturn_t wl1271_irq(int irq, void *data); | ||
181 | bool wl1271_set_block_size(struct wl1271 *wl); | ||
182 | int wl1271_tx_dummy_packet(struct wl1271 *wl); | 177 | int wl1271_tx_dummy_packet(struct wl1271 *wl); |
183 | 178 | ||
184 | #endif | 179 | #endif |
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 1cf987785053..56927051f665 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -931,7 +931,7 @@ static void wl1271_netstack_work(struct work_struct *work) | |||
931 | 931 | ||
932 | #define WL1271_IRQ_MAX_LOOPS 256 | 932 | #define WL1271_IRQ_MAX_LOOPS 256 |
933 | 933 | ||
934 | irqreturn_t wl1271_irq(int irq, void *cookie) | 934 | static irqreturn_t wl1271_irq(int irq, void *cookie) |
935 | { | 935 | { |
936 | int ret; | 936 | int ret; |
937 | u32 intr; | 937 | u32 intr; |
@@ -1053,7 +1053,6 @@ out: | |||
1053 | 1053 | ||
1054 | return IRQ_HANDLED; | 1054 | return IRQ_HANDLED; |
1055 | } | 1055 | } |
1056 | EXPORT_SYMBOL_GPL(wl1271_irq); | ||
1057 | 1056 | ||
1058 | static int wl1271_fetch_firmware(struct wl1271 *wl) | 1057 | static int wl1271_fetch_firmware(struct wl1271 *wl) |
1059 | { | 1058 | { |
@@ -4848,7 +4847,7 @@ static struct bin_attribute fwlog_attr = { | |||
4848 | .read = wl1271_sysfs_read_fwlog, | 4847 | .read = wl1271_sysfs_read_fwlog, |
4849 | }; | 4848 | }; |
4850 | 4849 | ||
4851 | int wl1271_register_hw(struct wl1271 *wl) | 4850 | static int wl1271_register_hw(struct wl1271 *wl) |
4852 | { | 4851 | { |
4853 | int ret; | 4852 | int ret; |
4854 | 4853 | ||
@@ -4889,9 +4888,8 @@ int wl1271_register_hw(struct wl1271 *wl) | |||
4889 | 4888 | ||
4890 | return 0; | 4889 | return 0; |
4891 | } | 4890 | } |
4892 | EXPORT_SYMBOL_GPL(wl1271_register_hw); | ||
4893 | 4891 | ||
4894 | void wl1271_unregister_hw(struct wl1271 *wl) | 4892 | static void wl1271_unregister_hw(struct wl1271 *wl) |
4895 | { | 4893 | { |
4896 | if (wl->state == WL1271_STATE_PLT) | 4894 | if (wl->state == WL1271_STATE_PLT) |
4897 | __wl1271_plt_stop(wl); | 4895 | __wl1271_plt_stop(wl); |
@@ -4901,9 +4899,8 @@ void wl1271_unregister_hw(struct wl1271 *wl) | |||
4901 | wl->mac80211_registered = false; | 4899 | wl->mac80211_registered = false; |
4902 | 4900 | ||
4903 | } | 4901 | } |
4904 | EXPORT_SYMBOL_GPL(wl1271_unregister_hw); | ||
4905 | 4902 | ||
4906 | int wl1271_init_ieee80211(struct wl1271 *wl) | 4903 | static int wl1271_init_ieee80211(struct wl1271 *wl) |
4907 | { | 4904 | { |
4908 | static const u32 cipher_suites[] = { | 4905 | static const u32 cipher_suites[] = { |
4909 | WLAN_CIPHER_SUITE_WEP40, | 4906 | WLAN_CIPHER_SUITE_WEP40, |
@@ -4989,11 +4986,10 @@ int wl1271_init_ieee80211(struct wl1271 *wl) | |||
4989 | 4986 | ||
4990 | return 0; | 4987 | return 0; |
4991 | } | 4988 | } |
4992 | EXPORT_SYMBOL_GPL(wl1271_init_ieee80211); | ||
4993 | 4989 | ||
4994 | #define WL1271_DEFAULT_CHANNEL 0 | 4990 | #define WL1271_DEFAULT_CHANNEL 0 |
4995 | 4991 | ||
4996 | struct ieee80211_hw *wl1271_alloc_hw(void) | 4992 | static struct ieee80211_hw *wl1271_alloc_hw(void) |
4997 | { | 4993 | { |
4998 | struct ieee80211_hw *hw; | 4994 | struct ieee80211_hw *hw; |
4999 | struct platform_device *plat_dev = NULL; | 4995 | struct platform_device *plat_dev = NULL; |
@@ -5162,9 +5158,8 @@ err_hw_alloc: | |||
5162 | 5158 | ||
5163 | return ERR_PTR(ret); | 5159 | return ERR_PTR(ret); |
5164 | } | 5160 | } |
5165 | EXPORT_SYMBOL_GPL(wl1271_alloc_hw); | ||
5166 | 5161 | ||
5167 | int wl1271_free_hw(struct wl1271 *wl) | 5162 | static int wl1271_free_hw(struct wl1271 *wl) |
5168 | { | 5163 | { |
5169 | /* Unblock any fwlog readers */ | 5164 | /* Unblock any fwlog readers */ |
5170 | mutex_lock(&wl->mutex); | 5165 | mutex_lock(&wl->mutex); |
@@ -5199,7 +5194,6 @@ int wl1271_free_hw(struct wl1271 *wl) | |||
5199 | 5194 | ||
5200 | return 0; | 5195 | return 0; |
5201 | } | 5196 | } |
5202 | EXPORT_SYMBOL_GPL(wl1271_free_hw); | ||
5203 | 5197 | ||
5204 | static irqreturn_t wl12xx_hardirq(int irq, void *cookie) | 5198 | static irqreturn_t wl12xx_hardirq(int irq, void *cookie) |
5205 | { | 5199 | { |