diff options
author | stephen hemminger <shemminger@vyatta.com> | 2010-10-04 15:59:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-05 03:47:38 -0400 |
commit | e3d32687a624845e97f9717d9d2027b44b8c49a2 (patch) | |
tree | 1eed57ce582fb34fcc720942e1db186bcf743afb /drivers/net/wimax | |
parent | debf279a81c93d6942a50ec0fd3ba1f158b109fb (diff) |
wimax: make functions local
Make wimax variables and functions local if possible.
Compile tested only.
This also removes a couple of unused EXPORT_SYMBOL.
If this breaks some out of tree code, please fix that
by putting the code in the kernel tree.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wimax')
-rw-r--r-- | drivers/net/wimax/i2400m/control.c | 18 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/driver.c | 2 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/i2400m-sdio.h | 1 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/i2400m.h | 9 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/rx.c | 2 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/sdio-rx.c | 2 |
6 files changed, 11 insertions, 23 deletions
diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c index 9fb03082153a..12b84ed0e38a 100644 --- a/drivers/net/wimax/i2400m/control.c +++ b/drivers/net/wimax/i2400m/control.c | |||
@@ -98,7 +98,7 @@ MODULE_PARM_DESC(power_save_disabled, | |||
98 | "False by default (so the device is told to do power " | 98 | "False by default (so the device is told to do power " |
99 | "saving)."); | 99 | "saving)."); |
100 | 100 | ||
101 | int i2400m_passive_mode; /* 0 (passive mode disabled) by default */ | 101 | static int i2400m_passive_mode; /* 0 (passive mode disabled) by default */ |
102 | module_param_named(passive_mode, i2400m_passive_mode, int, 0644); | 102 | module_param_named(passive_mode, i2400m_passive_mode, int, 0644); |
103 | MODULE_PARM_DESC(passive_mode, | 103 | MODULE_PARM_DESC(passive_mode, |
104 | "If true, the driver will not do any device setup " | 104 | "If true, the driver will not do any device setup " |
@@ -558,8 +558,9 @@ void i2400m_report_hook(struct i2400m *i2400m, | |||
558 | * processing should be done in the function that calls the | 558 | * processing should be done in the function that calls the |
559 | * command. This is here for some cases where it can't happen... | 559 | * command. This is here for some cases where it can't happen... |
560 | */ | 560 | */ |
561 | void i2400m_msg_ack_hook(struct i2400m *i2400m, | 561 | static void i2400m_msg_ack_hook(struct i2400m *i2400m, |
562 | const struct i2400m_l3l4_hdr *l3l4_hdr, size_t size) | 562 | const struct i2400m_l3l4_hdr *l3l4_hdr, |
563 | size_t size) | ||
563 | { | 564 | { |
564 | int result; | 565 | int result; |
565 | struct device *dev = i2400m_dev(i2400m); | 566 | struct device *dev = i2400m_dev(i2400m); |
@@ -1135,7 +1136,7 @@ error_alloc: | |||
1135 | * i2400m_report_state_hook() to parse the answer. This will set the | 1136 | * i2400m_report_state_hook() to parse the answer. This will set the |
1136 | * carrier state, as well as the RF Kill switches state. | 1137 | * carrier state, as well as the RF Kill switches state. |
1137 | */ | 1138 | */ |
1138 | int i2400m_cmd_get_state(struct i2400m *i2400m) | 1139 | static int i2400m_cmd_get_state(struct i2400m *i2400m) |
1139 | { | 1140 | { |
1140 | int result; | 1141 | int result; |
1141 | struct device *dev = i2400m_dev(i2400m); | 1142 | struct device *dev = i2400m_dev(i2400m); |
@@ -1177,8 +1178,6 @@ error_msg_to_dev: | |||
1177 | error_alloc: | 1178 | error_alloc: |
1178 | return result; | 1179 | return result; |
1179 | } | 1180 | } |
1180 | EXPORT_SYMBOL_GPL(i2400m_cmd_get_state); | ||
1181 | |||
1182 | 1181 | ||
1183 | /** | 1182 | /** |
1184 | * Set basic configuration settings | 1183 | * Set basic configuration settings |
@@ -1190,8 +1189,9 @@ EXPORT_SYMBOL_GPL(i2400m_cmd_get_state); | |||
1190 | * right endianess (LE). | 1189 | * right endianess (LE). |
1191 | * @arg_size: number of pointers in the @args array | 1190 | * @arg_size: number of pointers in the @args array |
1192 | */ | 1191 | */ |
1193 | int i2400m_set_init_config(struct i2400m *i2400m, | 1192 | static int i2400m_set_init_config(struct i2400m *i2400m, |
1194 | const struct i2400m_tlv_hdr **arg, size_t args) | 1193 | const struct i2400m_tlv_hdr **arg, |
1194 | size_t args) | ||
1195 | { | 1195 | { |
1196 | int result; | 1196 | int result; |
1197 | struct device *dev = i2400m_dev(i2400m); | 1197 | struct device *dev = i2400m_dev(i2400m); |
@@ -1258,8 +1258,6 @@ none: | |||
1258 | return result; | 1258 | return result; |
1259 | 1259 | ||
1260 | } | 1260 | } |
1261 | EXPORT_SYMBOL_GPL(i2400m_set_init_config); | ||
1262 | |||
1263 | 1261 | ||
1264 | /** | 1262 | /** |
1265 | * i2400m_set_idle_timeout - Set the device's idle mode timeout | 1263 | * i2400m_set_idle_timeout - Set the device's idle mode timeout |
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c index 9c8b78d4abd2..cdedab46ba21 100644 --- a/drivers/net/wimax/i2400m/driver.c +++ b/drivers/net/wimax/i2400m/driver.c | |||
@@ -122,7 +122,7 @@ struct i2400m_work *__i2400m_work_setup( | |||
122 | * works struct was already queued, but we have just allocated it, so | 122 | * works struct was already queued, but we have just allocated it, so |
123 | * it should not happen. | 123 | * it should not happen. |
124 | */ | 124 | */ |
125 | int i2400m_schedule_work(struct i2400m *i2400m, | 125 | static int i2400m_schedule_work(struct i2400m *i2400m, |
126 | void (*fn)(struct work_struct *), gfp_t gfp_flags, | 126 | void (*fn)(struct work_struct *), gfp_t gfp_flags, |
127 | const void *pl, size_t pl_size) | 127 | const void *pl, size_t pl_size) |
128 | { | 128 | { |
diff --git a/drivers/net/wimax/i2400m/i2400m-sdio.h b/drivers/net/wimax/i2400m/i2400m-sdio.h index 360d4fb195f4..1d63ffdedfde 100644 --- a/drivers/net/wimax/i2400m/i2400m-sdio.h +++ b/drivers/net/wimax/i2400m/i2400m-sdio.h | |||
@@ -140,7 +140,6 @@ void i2400ms_init(struct i2400ms *i2400ms) | |||
140 | 140 | ||
141 | extern int i2400ms_rx_setup(struct i2400ms *); | 141 | extern int i2400ms_rx_setup(struct i2400ms *); |
142 | extern void i2400ms_rx_release(struct i2400ms *); | 142 | extern void i2400ms_rx_release(struct i2400ms *); |
143 | extern ssize_t __i2400ms_rx_get_size(struct i2400ms *); | ||
144 | 143 | ||
145 | extern int i2400ms_tx_setup(struct i2400ms *); | 144 | extern int i2400ms_tx_setup(struct i2400ms *); |
146 | extern void i2400ms_tx_release(struct i2400ms *); | 145 | extern void i2400ms_tx_release(struct i2400ms *); |
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h index fa74777fd65f..59ac7705e76e 100644 --- a/drivers/net/wimax/i2400m/i2400m.h +++ b/drivers/net/wimax/i2400m/i2400m.h | |||
@@ -910,28 +910,19 @@ struct i2400m_work { | |||
910 | u8 pl[0]; | 910 | u8 pl[0]; |
911 | }; | 911 | }; |
912 | 912 | ||
913 | extern int i2400m_schedule_work(struct i2400m *, | ||
914 | void (*)(struct work_struct *), gfp_t, | ||
915 | const void *, size_t); | ||
916 | |||
917 | extern int i2400m_msg_check_status(const struct i2400m_l3l4_hdr *, | 913 | extern int i2400m_msg_check_status(const struct i2400m_l3l4_hdr *, |
918 | char *, size_t); | 914 | char *, size_t); |
919 | extern int i2400m_msg_size_check(struct i2400m *, | 915 | extern int i2400m_msg_size_check(struct i2400m *, |
920 | const struct i2400m_l3l4_hdr *, size_t); | 916 | const struct i2400m_l3l4_hdr *, size_t); |
921 | extern struct sk_buff *i2400m_msg_to_dev(struct i2400m *, const void *, size_t); | 917 | extern struct sk_buff *i2400m_msg_to_dev(struct i2400m *, const void *, size_t); |
922 | extern void i2400m_msg_to_dev_cancel_wait(struct i2400m *, int); | 918 | extern void i2400m_msg_to_dev_cancel_wait(struct i2400m *, int); |
923 | extern void i2400m_msg_ack_hook(struct i2400m *, | ||
924 | const struct i2400m_l3l4_hdr *, size_t); | ||
925 | extern void i2400m_report_hook(struct i2400m *, | 919 | extern void i2400m_report_hook(struct i2400m *, |
926 | const struct i2400m_l3l4_hdr *, size_t); | 920 | const struct i2400m_l3l4_hdr *, size_t); |
927 | extern void i2400m_report_hook_work(struct work_struct *); | 921 | extern void i2400m_report_hook_work(struct work_struct *); |
928 | extern int i2400m_cmd_enter_powersave(struct i2400m *); | 922 | extern int i2400m_cmd_enter_powersave(struct i2400m *); |
929 | extern int i2400m_cmd_get_state(struct i2400m *); | ||
930 | extern int i2400m_cmd_exit_idle(struct i2400m *); | 923 | extern int i2400m_cmd_exit_idle(struct i2400m *); |
931 | extern struct sk_buff *i2400m_get_device_info(struct i2400m *); | 924 | extern struct sk_buff *i2400m_get_device_info(struct i2400m *); |
932 | extern int i2400m_firmware_check(struct i2400m *); | 925 | extern int i2400m_firmware_check(struct i2400m *); |
933 | extern int i2400m_set_init_config(struct i2400m *, | ||
934 | const struct i2400m_tlv_hdr **, size_t); | ||
935 | extern int i2400m_set_idle_timeout(struct i2400m *, unsigned); | 926 | extern int i2400m_set_idle_timeout(struct i2400m *, unsigned); |
936 | 927 | ||
937 | static inline | 928 | static inline |
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c index 8cc9e319f435..c4876d029201 100644 --- a/drivers/net/wimax/i2400m/rx.c +++ b/drivers/net/wimax/i2400m/rx.c | |||
@@ -922,7 +922,7 @@ void i2400m_roq_queue_update_ws(struct i2400m *i2400m, struct i2400m_roq *roq, | |||
922 | * rx_roq_refcount becomes zero. This routine gets executed when | 922 | * rx_roq_refcount becomes zero. This routine gets executed when |
923 | * rx_roq_refcount becomes zero. | 923 | * rx_roq_refcount becomes zero. |
924 | */ | 924 | */ |
925 | void i2400m_rx_roq_destroy(struct kref *ref) | 925 | static void i2400m_rx_roq_destroy(struct kref *ref) |
926 | { | 926 | { |
927 | unsigned itr; | 927 | unsigned itr; |
928 | struct i2400m *i2400m | 928 | struct i2400m *i2400m |
diff --git a/drivers/net/wimax/i2400m/sdio-rx.c b/drivers/net/wimax/i2400m/sdio-rx.c index 8b809c2ead6c..fb6396dd115f 100644 --- a/drivers/net/wimax/i2400m/sdio-rx.c +++ b/drivers/net/wimax/i2400m/sdio-rx.c | |||
@@ -87,7 +87,7 @@ static const __le32 i2400m_ACK_BARKER[4] = { | |||
87 | * | 87 | * |
88 | * sdio_readl() doesn't work. | 88 | * sdio_readl() doesn't work. |
89 | */ | 89 | */ |
90 | ssize_t __i2400ms_rx_get_size(struct i2400ms *i2400ms) | 90 | static ssize_t __i2400ms_rx_get_size(struct i2400ms *i2400ms) |
91 | { | 91 | { |
92 | int ret, cnt, val; | 92 | int ret, cnt, val; |
93 | ssize_t rx_size; | 93 | ssize_t rx_size; |