diff options
| author | Nicolas Iooss <nicolas.iooss_linux@m4x.org> | 2015-08-01 21:32:17 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-08-07 02:55:18 +0200 |
| commit | 10742619ac63641bcce0a7c07f0dc7509201ed72 (patch) | |
| tree | 021a7d29f96ced8255cbe634a750861442960efd /drivers/acpi/debugfs.c | |
| parent | 4c62dbbce902cf2afa88cac89ec67c828160f431 (diff) | |
| download | lwn-10742619ac63641bcce0a7c07f0dc7509201ed72.tar.gz lwn-10742619ac63641bcce0a7c07f0dc7509201ed72.zip | |
ACPI: fix acpi_debugfs_init prototype
acpi_debugfs_init function is declared with return type int in
drivers/acpi/internal.h when CONFIG_DEBUG_FS is enabled, but its
definition in drivers/acpi/debugfs.c has return type void. This is due
to commit aecad432fd68 ("ACPI: Cleanup custom_method debug stuff"),
which changed the return type from int to void without updating the
declaration.
Fix this inconsistency by updating acpi_debugfs_init prototype. While
at it, include internal.h in debugfs.c so that the compiler can check
that the declaration and definition remain compatible.
Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/debugfs.c')
| -rw-r--r-- | drivers/acpi/debugfs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/debugfs.c b/drivers/acpi/debugfs.c index 6b1919f6bd82..68bb305b977f 100644 --- a/drivers/acpi/debugfs.c +++ b/drivers/acpi/debugfs.c @@ -7,6 +7,8 @@ #include <linux/debugfs.h> #include <linux/acpi.h> +#include "internal.h" + #define _COMPONENT ACPI_SYSTEM_COMPONENT ACPI_MODULE_NAME("debugfs"); |