diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2009-09-17 13:43:47 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-07 16:39:34 -0400 |
commit | 4e30cb691b9ba62642cc1594ef08f7439deb5a02 (patch) | |
tree | a1b67a9352bdde2837be984595c9c4b3e2b71b50 /drivers/net/wireless | |
parent | 1f4b9665032c4a1d60efd9ceaad2781cae6c7e92 (diff) |
iwlwifi: use S_IRUGO and S_IWUSR in module parameters
Instead of hardcode module parameter's permissions, use pre-defined.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 15 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 11 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 11 |
4 files changed, 22 insertions, 19 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 2500ab2e1d91..b5111702856a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -2361,21 +2361,22 @@ struct iwl_cfg iwl4965_agn_cfg = { | |||
2361 | /* Module firmware */ | 2361 | /* Module firmware */ |
2362 | MODULE_FIRMWARE(IWL4965_MODULE_FIRMWARE(IWL4965_UCODE_API_MAX)); | 2362 | MODULE_FIRMWARE(IWL4965_MODULE_FIRMWARE(IWL4965_UCODE_API_MAX)); |
2363 | 2363 | ||
2364 | module_param_named(antenna, iwl4965_mod_params.antenna, int, 0444); | 2364 | module_param_named(antenna, iwl4965_mod_params.antenna, int, S_IRUGO); |
2365 | MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])"); | 2365 | MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])"); |
2366 | module_param_named(swcrypto, iwl4965_mod_params.sw_crypto, int, 0444); | 2366 | module_param_named(swcrypto, iwl4965_mod_params.sw_crypto, int, S_IRUGO); |
2367 | MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])"); | 2367 | MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])"); |
2368 | module_param_named( | 2368 | module_param_named( |
2369 | disable_hw_scan, iwl4965_mod_params.disable_hw_scan, int, 0444); | 2369 | disable_hw_scan, iwl4965_mod_params.disable_hw_scan, int, S_IRUGO); |
2370 | MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)"); | 2370 | MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)"); |
2371 | 2371 | ||
2372 | module_param_named(queues_num, iwl4965_mod_params.num_of_queues, int, 0444); | 2372 | module_param_named(queues_num, iwl4965_mod_params.num_of_queues, int, S_IRUGO); |
2373 | MODULE_PARM_DESC(queues_num, "number of hw queues."); | 2373 | MODULE_PARM_DESC(queues_num, "number of hw queues."); |
2374 | /* 11n */ | 2374 | /* 11n */ |
2375 | module_param_named(11n_disable, iwl4965_mod_params.disable_11n, int, 0444); | 2375 | module_param_named(11n_disable, iwl4965_mod_params.disable_11n, int, S_IRUGO); |
2376 | MODULE_PARM_DESC(11n_disable, "disable 11n functionality"); | 2376 | MODULE_PARM_DESC(11n_disable, "disable 11n functionality"); |
2377 | module_param_named(amsdu_size_8K, iwl4965_mod_params.amsdu_size_8K, int, 0444); | 2377 | module_param_named(amsdu_size_8K, iwl4965_mod_params.amsdu_size_8K, |
2378 | int, S_IRUGO); | ||
2378 | MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size"); | 2379 | MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size"); |
2379 | 2380 | ||
2380 | module_param_named(fw_restart4965, iwl4965_mod_params.restart_fw, int, 0444); | 2381 | module_param_named(fw_restart4965, iwl4965_mod_params.restart_fw, int, S_IRUGO); |
2381 | MODULE_PARM_DESC(fw_restart4965, "restart firmware in case of error"); | 2382 | MODULE_PARM_DESC(fw_restart4965, "restart firmware in case of error"); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index c81fd4bc32b4..75fa55db330e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -1752,14 +1752,15 @@ struct iwl_cfg iwl5150_agn_cfg = { | |||
1752 | MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX)); | 1752 | MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX)); |
1753 | MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX)); | 1753 | MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX)); |
1754 | 1754 | ||
1755 | module_param_named(swcrypto50, iwl50_mod_params.sw_crypto, bool, 0444); | 1755 | module_param_named(swcrypto50, iwl50_mod_params.sw_crypto, bool, S_IRUGO); |
1756 | MODULE_PARM_DESC(swcrypto50, | 1756 | MODULE_PARM_DESC(swcrypto50, |
1757 | "using software crypto engine (default 0 [hardware])\n"); | 1757 | "using software crypto engine (default 0 [hardware])\n"); |
1758 | module_param_named(queues_num50, iwl50_mod_params.num_of_queues, int, 0444); | 1758 | module_param_named(queues_num50, iwl50_mod_params.num_of_queues, int, S_IRUGO); |
1759 | MODULE_PARM_DESC(queues_num50, "number of hw queues in 50xx series"); | 1759 | MODULE_PARM_DESC(queues_num50, "number of hw queues in 50xx series"); |
1760 | module_param_named(11n_disable50, iwl50_mod_params.disable_11n, int, 0444); | 1760 | module_param_named(11n_disable50, iwl50_mod_params.disable_11n, int, S_IRUGO); |
1761 | MODULE_PARM_DESC(11n_disable50, "disable 50XX 11n functionality"); | 1761 | MODULE_PARM_DESC(11n_disable50, "disable 50XX 11n functionality"); |
1762 | module_param_named(amsdu_size_8K50, iwl50_mod_params.amsdu_size_8K, int, 0444); | 1762 | module_param_named(amsdu_size_8K50, iwl50_mod_params.amsdu_size_8K, |
1763 | int, S_IRUGO); | ||
1763 | MODULE_PARM_DESC(amsdu_size_8K50, "enable 8K amsdu size in 50XX series"); | 1764 | MODULE_PARM_DESC(amsdu_size_8K50, "enable 8K amsdu size in 50XX series"); |
1764 | module_param_named(fw_restart50, iwl50_mod_params.restart_fw, int, 0444); | 1765 | module_param_named(fw_restart50, iwl50_mod_params.restart_fw, int, S_IRUGO); |
1765 | MODULE_PARM_DESC(fw_restart50, "restart firmware in case of error"); | 1766 | MODULE_PARM_DESC(fw_restart50, "restart firmware in case of error"); |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 2a7cc4bdf3fd..cf2b481dca6d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -3322,9 +3322,9 @@ module_exit(iwl_exit); | |||
3322 | module_init(iwl_init); | 3322 | module_init(iwl_init); |
3323 | 3323 | ||
3324 | #ifdef CONFIG_IWLWIFI_DEBUG | 3324 | #ifdef CONFIG_IWLWIFI_DEBUG |
3325 | module_param_named(debug50, iwl_debug_level, uint, 0444); | 3325 | module_param_named(debug50, iwl_debug_level, uint, S_IRUGO); |
3326 | MODULE_PARM_DESC(debug50, "50XX debug output mask (deprecated)"); | 3326 | MODULE_PARM_DESC(debug50, "50XX debug output mask (deprecated)"); |
3327 | module_param_named(debug, iwl_debug_level, uint, 0644); | 3327 | module_param_named(debug, iwl_debug_level, uint, S_IRUGO | S_IWUSR); |
3328 | MODULE_PARM_DESC(debug, "debug output mask"); | 3328 | MODULE_PARM_DESC(debug, "debug output mask"); |
3329 | #endif | 3329 | #endif |
3330 | 3330 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index c390dbd877e4..4a4af0f782f0 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -4225,18 +4225,19 @@ static void __exit iwl3945_exit(void) | |||
4225 | 4225 | ||
4226 | MODULE_FIRMWARE(IWL3945_MODULE_FIRMWARE(IWL3945_UCODE_API_MAX)); | 4226 | MODULE_FIRMWARE(IWL3945_MODULE_FIRMWARE(IWL3945_UCODE_API_MAX)); |
4227 | 4227 | ||
4228 | module_param_named(antenna, iwl3945_mod_params.antenna, int, 0444); | 4228 | module_param_named(antenna, iwl3945_mod_params.antenna, int, S_IRUGO); |
4229 | MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])"); | 4229 | MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])"); |
4230 | module_param_named(swcrypto, iwl3945_mod_params.sw_crypto, int, 0444); | 4230 | module_param_named(swcrypto, iwl3945_mod_params.sw_crypto, int, S_IRUGO); |
4231 | MODULE_PARM_DESC(swcrypto, | 4231 | MODULE_PARM_DESC(swcrypto, |
4232 | "using software crypto (default 1 [software])\n"); | 4232 | "using software crypto (default 1 [software])\n"); |
4233 | #ifdef CONFIG_IWLWIFI_DEBUG | 4233 | #ifdef CONFIG_IWLWIFI_DEBUG |
4234 | module_param_named(debug, iwl_debug_level, uint, 0644); | 4234 | module_param_named(debug, iwl_debug_level, uint, S_IRUGO | S_IWUSR); |
4235 | MODULE_PARM_DESC(debug, "debug output mask"); | 4235 | MODULE_PARM_DESC(debug, "debug output mask"); |
4236 | #endif | 4236 | #endif |
4237 | module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan, int, 0444); | 4237 | module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan, |
4238 | int, S_IRUGO); | ||
4238 | MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)"); | 4239 | MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)"); |
4239 | module_param_named(fw_restart3945, iwl3945_mod_params.restart_fw, int, 0444); | 4240 | module_param_named(fw_restart3945, iwl3945_mod_params.restart_fw, int, S_IRUGO); |
4240 | MODULE_PARM_DESC(fw_restart3945, "restart firmware in case of error"); | 4241 | MODULE_PARM_DESC(fw_restart3945, "restart firmware in case of error"); |
4241 | 4242 | ||
4242 | module_exit(iwl3945_exit); | 4243 | module_exit(iwl3945_exit); |