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

Commit 443dea72 authored by Thomas Renninger's avatar Thomas Renninger Committed by Len Brown
Browse files

ACPI: Export acpi_check_resource_conflict 



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: default avatarJean Delvare <jdelvare@suse.de>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent df92e695

drivers/acpi/osl.c

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

include/linux/acpi.h

+8 −0
Original line number Diff line number Diff line
@@ -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)

{