dde_linux: cleanup module param handling

Instead of using a somewhat incomplete module_param_named() macro,
which will influence other drivers, patch the driver that requires
this treatment.

Fixes #2169
Fixes #2155
This commit is contained in:
Josef Söntgen 2016-10-27 19:00:13 +02:00 committed by Christian Helmuth
parent da68dcc63d
commit a3e11a60c0
4 changed files with 12 additions and 11 deletions

View File

@ -333,3 +333,13 @@ index 9ee6bc1..02d740d 100644
scatterwalk_start(&walk, sg);
scatterwalk_copychunks(buf, &walk, nbytes, out);
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -1635,6 +1635,7 @@
module_param_named(swcrypto, iwlwifi_mod_params.sw_crypto, int, S_IRUGO);
MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])");
module_param_named(11n_disable, iwlwifi_mod_params.disable_11n, uint, S_IRUGO);
+unsigned int *module_param_11n_disable = &iwlwifi_mod_params.disable_11n;
MODULE_PARM_DESC(11n_disable,
"disable 11n functionality, bitmap: 1: full, 2: disable agg TX, 4: disable agg RX, 8 enable agg TX");
module_param_named(amsdu_size_8K, iwlwifi_mod_params.amsdu_size_8K,

View File

@ -1 +1 @@
01af4e74fb2b25133f181d1b73d673b9683c330b
1652f5b16e4106d7f283c8bb31a8720891b0e05d

View File

@ -64,14 +64,7 @@ int try_module_get(struct module *);
*************************/
#define module_param(name, type, perm)
/*
* For our shenanigans to work we have to define charp (used by the
* iwlwifi module).
*/
#define charp char*
#define module_param_named(name, value, type, perm) \
type *module_param_ ## name = &value;
#define module_param_named(name, value, type, perm)
#define module_param_unsafe(name, type, perm)
#define module_param_named_unsafe(name, value, type, perm)

View File

@ -509,8 +509,6 @@ int isprint(int);
** linux/moduleparam.h **
*************************/
#define module_param(name, type, perm)
#define module_param_named(name, value, type, perm)
#define module_param_array_named(name, array, type, nump, perm)
#define module_param_string(name, string, len, perm)
#define core_param(name, var, type, perm)