From: Rami Rosen Date: Fri, 11 Sep 2015 14:49:22 +0000 (+0300) Subject: ACPI: change acpi_sleep_proc_init() to return void X-Git-Tag: v4.14-rc1~4430^2~5^5~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f934c745079ea3a15e8619350faf681dad42cc91;p=platform%2Fkernel%2Flinux-rpi.git ACPI: change acpi_sleep_proc_init() to return void This patch changes the type of the return value of the acpi_sleep_proc_init() method to be void, as this method never fails and its return value is never used. Signed-off-by: Rami Rosen \ [ rjw : Fixed up the static inline stub ] Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index e72c6a6..c31787b 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -179,13 +179,13 @@ static inline int acpi_sleep_init(void) { return -ENXIO; } #endif #ifdef CONFIG_ACPI_SLEEP -int acpi_sleep_proc_init(void); +void acpi_sleep_proc_init(void); int suspend_nvs_alloc(void); void suspend_nvs_free(void); int suspend_nvs_save(void); void suspend_nvs_restore(void); #else -static inline int acpi_sleep_proc_init(void) { return 0; } +static inline void acpi_sleep_proc_init(void) {} static inline int suspend_nvs_alloc(void) { return 0; } static inline void suspend_nvs_free(void) {} static inline int suspend_nvs_save(void) { return 0; } diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index 75c28ea..2a35815 100644 --- a/drivers/acpi/proc.c +++ b/drivers/acpi/proc.c @@ -144,11 +144,9 @@ static const struct file_operations acpi_system_wakeup_device_fops = { .release = single_release, }; -int __init acpi_sleep_proc_init(void) +void __init acpi_sleep_proc_init(void) { /* 'wakeup device' [R/W] */ proc_create("wakeup", S_IFREG | S_IRUGO | S_IWUSR, acpi_root_dir, &acpi_system_wakeup_device_fops); - - return 0; }