diff options
author | Prasanna S Panchamukhi <prasannax.s.panchamukhi@intel.com> | 2009-11-17 21:29:35 -0500 |
---|---|---|
committer | Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> | 2010-05-11 17:10:24 -0400 |
commit | 9d7fdf1ba9d5b8963bf8ffe29eea17f508e81bde (patch) | |
tree | 0b3b3573308ce69bedd3f9005a714d7c7bab9d48 | |
parent | 3e02a06ae3dce2eb804bb4afadb7067c80d6c096 (diff) |
wimax/i2400m: Move module params to other file so they can be static
This patch moves the module parameters to the file where they
can be avoided to be global and allow them to be static.
The module param : idle_mode_disabled and power_save_disabled
are moved from driver.c to control.c. Also these module parameters
are declared to be static as they are not required to be global anymore.
The module param : rx_reorder_disabled is moved from driver.c file to
rx.c file. Also this parameter is declated as static as it is not
required to be global anymore.
Signed-off-by: Prasanna S Panchamukhi<prasannax.s.panchamukhi@intel.com>
-rw-r--r-- | drivers/net/wimax/i2400m/control.c | 15 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/driver.c | 19 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/i2400m.h | 6 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/rx.c | 5 |
4 files changed, 20 insertions, 25 deletions
diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c index 6180772dcc09..0c1aa8867531 100644 --- a/drivers/net/wimax/i2400m/control.c +++ b/drivers/net/wimax/i2400m/control.c | |||
@@ -83,6 +83,21 @@ | |||
83 | #define D_SUBMODULE control | 83 | #define D_SUBMODULE control |
84 | #include "debug-levels.h" | 84 | #include "debug-levels.h" |
85 | 85 | ||
86 | static int i2400m_idle_mode_disabled;/* 0 (idle mode enabled) by default */ | ||
87 | module_param_named(idle_mode_disabled, i2400m_idle_mode_disabled, int, 0644); | ||
88 | MODULE_PARM_DESC(idle_mode_disabled, | ||
89 | "If true, the device will not enable idle mode negotiation " | ||
90 | "with the base station (when connected) to save power."); | ||
91 | |||
92 | /* 0 (power saving enabled) by default */ | ||
93 | static int i2400m_power_save_disabled; | ||
94 | module_param_named(power_save_disabled, i2400m_power_save_disabled, int, 0644); | ||
95 | MODULE_PARM_DESC(power_save_disabled, | ||
96 | "If true, the driver will not tell the device to enter " | ||
97 | "power saving mode when it reports it is ready for it. " | ||
98 | "False by default (so the device is told to do power " | ||
99 | "saving)."); | ||
100 | |||
86 | int i2400m_passive_mode; /* 0 (passive mode disabled) by default */ | 101 | int i2400m_passive_mode; /* 0 (passive mode disabled) by default */ |
87 | module_param_named(passive_mode, i2400m_passive_mode, int, 0644); | 102 | module_param_named(passive_mode, i2400m_passive_mode, int, 0644); |
88 | MODULE_PARM_DESC(passive_mode, | 103 | MODULE_PARM_DESC(passive_mode, |
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c index 39cf96a90d7a..66bdb5d6cd34 100644 --- a/drivers/net/wimax/i2400m/driver.c +++ b/drivers/net/wimax/i2400m/driver.c | |||
@@ -75,25 +75,6 @@ | |||
75 | #include "debug-levels.h" | 75 | #include "debug-levels.h" |
76 | 76 | ||
77 | 77 | ||
78 | int i2400m_idle_mode_disabled; /* 0 (idle mode enabled) by default */ | ||
79 | module_param_named(idle_mode_disabled, i2400m_idle_mode_disabled, int, 0644); | ||
80 | MODULE_PARM_DESC(idle_mode_disabled, | ||
81 | "If true, the device will not enable idle mode negotiation " | ||
82 | "with the base station (when connected) to save power."); | ||
83 | |||
84 | int i2400m_rx_reorder_disabled; /* 0 (rx reorder enabled) by default */ | ||
85 | module_param_named(rx_reorder_disabled, i2400m_rx_reorder_disabled, int, 0644); | ||
86 | MODULE_PARM_DESC(rx_reorder_disabled, | ||
87 | "If true, RX reordering will be disabled."); | ||
88 | |||
89 | int i2400m_power_save_disabled; /* 0 (power saving enabled) by default */ | ||
90 | module_param_named(power_save_disabled, i2400m_power_save_disabled, int, 0644); | ||
91 | MODULE_PARM_DESC(power_save_disabled, | ||
92 | "If true, the driver will not tell the device to enter " | ||
93 | "power saving mode when it reports it is ready for it. " | ||
94 | "False by default (so the device is told to do power " | ||
95 | "saving)."); | ||
96 | |||
97 | static char i2400m_debug_params[128]; | 78 | static char i2400m_debug_params[128]; |
98 | module_param_string(debug, i2400m_debug_params, sizeof(i2400m_debug_params), | 79 | module_param_string(debug, i2400m_debug_params, sizeof(i2400m_debug_params), |
99 | 0644); | 80 | 0644); |
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h index 1babc55b1312..fa74777fd65f 100644 --- a/drivers/net/wimax/i2400m/i2400m.h +++ b/drivers/net/wimax/i2400m/i2400m.h | |||
@@ -885,7 +885,6 @@ extern int i2400m_rx(struct i2400m *, struct sk_buff *); | |||
885 | extern struct i2400m_msg_hdr *i2400m_tx_msg_get(struct i2400m *, size_t *); | 885 | extern struct i2400m_msg_hdr *i2400m_tx_msg_get(struct i2400m *, size_t *); |
886 | extern void i2400m_tx_msg_sent(struct i2400m *); | 886 | extern void i2400m_tx_msg_sent(struct i2400m *); |
887 | 887 | ||
888 | extern int i2400m_power_save_disabled; | ||
889 | 888 | ||
890 | /* | 889 | /* |
891 | * Utility functions | 890 | * Utility functions |
@@ -992,10 +991,5 @@ extern int i2400m_barker_db_init(const char *); | |||
992 | extern void i2400m_barker_db_exit(void); | 991 | extern void i2400m_barker_db_exit(void); |
993 | 992 | ||
994 | 993 | ||
995 | /* Module parameters */ | ||
996 | |||
997 | extern int i2400m_idle_mode_disabled; | ||
998 | extern int i2400m_rx_reorder_disabled; | ||
999 | |||
1000 | 994 | ||
1001 | #endif /* #ifndef __I2400M_H__ */ | 995 | #endif /* #ifndef __I2400M_H__ */ |
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c index 0004c686ac68..c835ae8b89ce 100644 --- a/drivers/net/wimax/i2400m/rx.c +++ b/drivers/net/wimax/i2400m/rx.c | |||
@@ -155,6 +155,11 @@ | |||
155 | #define D_SUBMODULE rx | 155 | #define D_SUBMODULE rx |
156 | #include "debug-levels.h" | 156 | #include "debug-levels.h" |
157 | 157 | ||
158 | static int i2400m_rx_reorder_disabled; /* 0 (rx reorder enabled) by default */ | ||
159 | module_param_named(rx_reorder_disabled, i2400m_rx_reorder_disabled, int, 0644); | ||
160 | MODULE_PARM_DESC(rx_reorder_disabled, | ||
161 | "If true, RX reordering will be disabled."); | ||
162 | |||
158 | struct i2400m_report_hook_args { | 163 | struct i2400m_report_hook_args { |
159 | struct sk_buff *skb_rx; | 164 | struct sk_buff *skb_rx; |
160 | const struct i2400m_l3l4_hdr *l3l4_hdr; | 165 | const struct i2400m_l3l4_hdr *l3l4_hdr; |