Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f934c745 authored by Rami Rosen's avatar Rami Rosen Committed by Rafael J. Wysocki
Browse files

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: default avatarRami Rosen <ramirose@gmail.com&gt;\>
[ rjw : Fixed up the static inline stub ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c33cab60

drivers/acpi/internal.h

+2 −2
Original line number Diff line number Diff line
@@ -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; }

drivers/acpi/proc.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

}