diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-16 00:46:33 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-16 00:46:33 +0300 |
| commit | 1be2172e96e33bfa22a5c7a651f768ef30ce3984 (patch) | |
| tree | c5bf050b3914b43976f9c3ae686b21b4175e29c4 /drivers/acpi/button.c | |
| parent | 3c18767a45650009d02537677ffb7997bd402a2c (diff) | |
| parent | ece1996a21eeb344b49200e627c6660111009c10 (diff) | |
| download | linux-1be2172e96e33bfa22a5c7a651f768ef30ce3984.tar.xz | |
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/acpi/button.c')
| -rw-r--r-- | drivers/acpi/button.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index c391898b483c..bf8e4d371fa7 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -573,7 +573,8 @@ static int acpi_button_remove(struct acpi_device *device) return 0; } -static int param_set_lid_init_state(const char *val, struct kernel_param *kp) +static int param_set_lid_init_state(const char *val, + const struct kernel_param *kp) { int result = 0; @@ -591,7 +592,8 @@ static int param_set_lid_init_state(const char *val, struct kernel_param *kp) return result; } -static int param_get_lid_init_state(char *buffer, struct kernel_param *kp) +static int param_get_lid_init_state(char *buffer, + const struct kernel_param *kp) { switch (lid_init_state) { case ACPI_BUTTON_LID_INIT_OPEN: |