diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 22:46:33 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 22:46:33 +0100 |
| commit | 1be2172e96e33bfa22a5c7a651f768ef30ce3984 (patch) | |
| tree | c5bf050b3914b43976f9c3ae686b21b4175e29c4 /drivers/mtd/devices | |
| parent | Merge tag 'mailbox-v4.15' of git://git.linaro.org/landing-teams/working/fujit... (diff) | |
| parent | module: Do not paper over type mismatches in module_param_call() (diff) | |
| download | linux-1be2172e96e33bfa22a5c7a651f768ef30ce3984.tar.xz linux-1be2172e96e33bfa22a5c7a651f768ef30ce3984.zip | |
Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux
Pull module updates from Jessica Yu:
"Summary of modules changes for the 4.15 merge window:
- treewide module_param_call() cleanup, fix up set/get function
prototype mismatches, from Kees Cook
- minor code cleanups"
* tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
module: Do not paper over type mismatches in module_param_call()
treewide: Fix function prototypes for module_param_call()
module: Prepare to convert all module_param_call() prototypes
kernel/module: Delete an error message for a failed memory allocation in add_module_usage()
Diffstat (limited to 'drivers/mtd/devices')
| -rw-r--r-- | drivers/mtd/devices/block2mtd.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/devices/phram.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c index 7c887f111a7d..62fd6905c648 100644 --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c @@ -431,7 +431,7 @@ static int block2mtd_setup2(const char *val) } -static int block2mtd_setup(const char *val, struct kernel_param *kp) +static int block2mtd_setup(const char *val, const struct kernel_param *kp) { #ifdef MODULE return block2mtd_setup2(val); diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c index 8b66e52ca3cc..7287696a21f9 100644 --- a/drivers/mtd/devices/phram.c +++ b/drivers/mtd/devices/phram.c @@ -266,7 +266,7 @@ static int phram_setup(const char *val) return ret; } -static int phram_param_call(const char *val, struct kernel_param *kp) +static int phram_param_call(const char *val, const struct kernel_param *kp) { #ifdef MODULE return phram_setup(val); |