[PATCH v3 3/6] SFI: Fix warnings reported by W=1 builds.

From: Lv Zheng
Date: Fri Dec 06 2013 - 03:52:12 EST


The following warnings can be seen for W=1 builds. This is because
original sfi_acpi.[ch] header inclusions are wrong.

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]

This patch fixes this existing issue. It is on top of the following
commit which doesn't take care about existing issues:
Commit: 4e8fb7987f7d0390a2e74622c7c1cbb6760c6516
From: Lv Zheng <lv.zheng@xxxxxxxxx>
Date: Tue, 3 Dec 2013 08:49:16 +0800
Subject: [PATCH] ACPI: Clean up inclusions of ACPI header files

Reported-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Signed-off-by: Lv Zheng <lv.zheng@xxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: Feng Tang <feng.tang@xxxxxxxxx>
Cc: sfi-devel@xxxxxxxxxxxxxxxxxx
---
arch/x86/pci/mmconfig-shared.c | 1 -
drivers/sfi/sfi_acpi.c | 4 +---
include/linux/sfi_acpi.h | 3 +++
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 082e881..248642f 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -12,7 +12,6 @@

#include <linux/pci.h>
#include <linux/init.h>
-#include <linux/acpi.h>
#include <linux/sfi_acpi.h>
#include <linux/bitmap.h>
#include <linux/dmi.h>
diff --git a/drivers/sfi/sfi_acpi.c b/drivers/sfi/sfi_acpi.c
index 5e753d7..d277b36 100644
--- a/drivers/sfi/sfi_acpi.c
+++ b/drivers/sfi/sfi_acpi.c
@@ -60,9 +60,7 @@
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt

#include <linux/kernel.h>
-#include <acpi/acpi.h> /* FIXME: inclusion should be removed */
-
-#include <linux/sfi.h>
+#include <linux/sfi_acpi.h>
#include "sfi_core.h"

/*
diff --git a/include/linux/sfi_acpi.h b/include/linux/sfi_acpi.h
index 2cfcb79..4723bbf 100644
--- a/include/linux/sfi_acpi.h
+++ b/include/linux/sfi_acpi.h
@@ -59,6 +59,9 @@
#ifndef _LINUX_SFI_ACPI_H
#define _LINUX_SFI_ACPI_H

+#include <linux/acpi.h>
+#include <linux/sfi.h>
+
#ifdef CONFIG_SFI
#include <acpi/acpi.h> /* FIXME: inclusion should be removed */

--
1.7.10

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/