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/ubi | |
| 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/ubi')
| -rw-r--r-- | drivers/mtd/ubi/build.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 842550b5712a..136ce05d2328 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -1334,7 +1334,7 @@ static int bytes_str_to_int(const char *str) * This function returns zero in case of success and a negative error code in * case of error. */ -static int ubi_mtd_param_parse(const char *val, struct kernel_param *kp) +static int ubi_mtd_param_parse(const char *val, const struct kernel_param *kp) { int i, len; struct mtd_dev_param *p; |