Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

SFI / ACPI: Fix warnings reported during builds with W=1

The following warnings can be seen in W=1 builds, because the original
sfi_acpi.[ch] header inclusions are incorrect:

include/linux/sfi_acpi.h:72:2: error: implicit declaration of function 'acpi_table_parse' [-Werror=implicit-function-declaration]
drivers/sfi/sfi_acpi.c:154:5: warning: no previous prototype for 'sfi_acpi_table_parse' [-Wmissing-prototypes]

Fix linux/sfi_acpi.h and modify drivers/sfi/sfi_acpi.c accordingly.

Reported-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
[rjw: Subject and changelog]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Lv Zheng and committed by
Rafael J. Wysocki
c099eacb fe5e49cb

+4 -4
-1
arch/x86/pci/mmconfig-shared.c
··· 12 12 13 13 #include <linux/pci.h> 14 14 #include <linux/init.h> 15 - #include <linux/acpi.h> 16 15 #include <linux/sfi_acpi.h> 17 16 #include <linux/bitmap.h> 18 17 #include <linux/dmi.h>
+1 -3
drivers/sfi/sfi_acpi.c
··· 60 60 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt 61 61 62 62 #include <linux/kernel.h> 63 - #include <acpi/acpi.h> /* FIXME: inclusion should be removed */ 64 - 65 - #include <linux/sfi.h> 63 + #include <linux/sfi_acpi.h> 66 64 #include "sfi_core.h" 67 65 68 66 /*
+3
include/linux/sfi_acpi.h
··· 59 59 #ifndef _LINUX_SFI_ACPI_H 60 60 #define _LINUX_SFI_ACPI_H 61 61 62 + #include <linux/acpi.h> 63 + #include <linux/sfi.h> 64 + 62 65 #ifdef CONFIG_SFI 63 66 #include <acpi/acpi.h> /* FIXME: inclusion should be removed */ 64 67