[PATCH 090/112] ACPI: Export acpi_check_resource_conflict

Len Brown
2008-02-07T09:36:51Z

From: Thomas Renninger <trenn@suse.de>

Export acpi_check_resource_conflict(), sometimes drivers already have
a struct resource at hand so no need to use the wrappers to build a new
one.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/osl.c | 3 ++-
include/linux/acpi.h | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 222f7b1..bc1604b 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1157,7 +1157,7 @@ __setup("acpi_enforce_resources=", acpi_enforce_resources_setup);

/* Check for resource conflicts between ACPI OperationRegions and native
* drivers */
-static int acpi_check_resource_conflict(struct resource *res)
+int acpi_check_resource_conflict(struct resource *res)
{
struct acpi_res_list *res_list_elem;
int ioport;
@@ -1207,6 +1207,7 @@ static int acpi_check_resource_conflict(struct resource *res)
}
return 0;
}
+EXPORT_SYMBOL(acpi_check_resource_conflict);

int acpi_check_region(resource_size_t start, resource_size_t n,
const char *name)
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 893f90a..a031df8 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -25,6 +25,7 @@
#ifndef _LINUX_ACPI_H
#define _LINUX_ACPI_H

+#include <linux/ioport.h> /* for struct resource */

#ifdef CONFIG_ACPI

@@ -217,6 +218,8 @@ extern int pnpacpi_disabled;
#define PXM_INVAL (-1)
#define NID_INVAL (-1)

+int acpi_check_resource_conflict(struct resource *res);
+
int acpi_check_region(resource_size_t start, resource_size_t n,
const char *name);
int acpi_check_mem_region(resource_size_t start, resource_size_t n,
@@ -234,6 +237,11 @@ static inline int acpi_boot_table_init(void)
return 0;
}

+static inline int acpi_check_resource_conflict(struct resource *res)
+{
+ return 0;
+}
+
static inline int acpi_check_region(resource_size_t start, resource_size_t n,
const char *name)
{
--
1.5.4.23.gef5b9