diff options
-rw-r--r-- | drivers/acpi/internal.h | 4 | ||||
-rw-r--r-- | drivers/acpi/proc.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index e72c6a67201f..c31787bef2d3 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h | |||
@@ -179,13 +179,13 @@ static inline int acpi_sleep_init(void) { return -ENXIO; } | |||
179 | #endif | 179 | #endif |
180 | 180 | ||
181 | #ifdef CONFIG_ACPI_SLEEP | 181 | #ifdef CONFIG_ACPI_SLEEP |
182 | int acpi_sleep_proc_init(void); | 182 | void acpi_sleep_proc_init(void); |
183 | int suspend_nvs_alloc(void); | 183 | int suspend_nvs_alloc(void); |
184 | void suspend_nvs_free(void); | 184 | void suspend_nvs_free(void); |
185 | int suspend_nvs_save(void); | 185 | int suspend_nvs_save(void); |
186 | void suspend_nvs_restore(void); | 186 | void suspend_nvs_restore(void); |
187 | #else | 187 | #else |
188 | static inline int acpi_sleep_proc_init(void) { return 0; } | 188 | static inline void acpi_sleep_proc_init(void) {} |
189 | static inline int suspend_nvs_alloc(void) { return 0; } | 189 | static inline int suspend_nvs_alloc(void) { return 0; } |
190 | static inline void suspend_nvs_free(void) {} | 190 | static inline void suspend_nvs_free(void) {} |
191 | static inline int suspend_nvs_save(void) { return 0; } | 191 | static inline int suspend_nvs_save(void) { return 0; } |
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index 75c28eae8860..2a358154b770 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 = { | |||
144 | .release = single_release, | 144 | .release = single_release, |
145 | }; | 145 | }; |
146 | 146 | ||
147 | int __init acpi_sleep_proc_init(void) | 147 | void __init acpi_sleep_proc_init(void) |
148 | { | 148 | { |
149 | /* 'wakeup device' [R/W] */ | 149 | /* 'wakeup device' [R/W] */ |
150 | proc_create("wakeup", S_IFREG | S_IRUGO | S_IWUSR, | 150 | proc_create("wakeup", S_IFREG | S_IRUGO | S_IWUSR, |
151 | acpi_root_dir, &acpi_system_wakeup_device_fops); | 151 | acpi_root_dir, &acpi_system_wakeup_device_fops); |
152 | |||
153 | return 0; | ||
154 | } | 152 | } |