Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ACPI: osl.c: replace return_ACPI_STATUS with return

Browse source 
return_ACPI_STATUS is an internal acpica function, replace it with return.
acpi_gbl_permanent_mmap moved from acglobal.h to acpixf.h for external use

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Lin Ming 2008-12-31 09:23:57 +08:00 • committed by Len Brown
parent 9b02d6e198
commit 889c78be9e
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/acpi/osl.c
View file

@ -726,7 +726,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
dpc = kmalloc(sizeof(struct acpi_os_dpc), GFP_ATOMIC); dpc = kmalloc(sizeof(struct acpi_os_dpc), GFP_ATOMIC);
if (!dpc) if (!dpc)
return_ACPI_STATUS(AE_NO_MEMORY); return AE_NO_MEMORY;
dpc->function = function; dpc->function = function;
dpc->context = context; dpc->context = context;
@ -747,7 +747,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type,
status = AE_ERROR; status = AE_ERROR;
kfree(dpc); kfree(dpc);
} }
return_ACPI_STATUS(status); return status;
} }
acpi_status acpi_os_execute(acpi_execute_type type, acpi_status acpi_os_execute(acpi_execute_type type,

1
include/acpi/acglobal.h
View file

@ -141,7 +141,6 @@ ACPI_EXTERN u32 acpi_gbl_trace_flags;
ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list; ACPI_EXTERN struct acpi_internal_rsdt acpi_gbl_root_table_list;
ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT; ACPI_EXTERN struct acpi_table_fadt acpi_gbl_FADT;
ACPI_EXTERN struct acpi_table_facs *acpi_gbl_FACS; ACPI_EXTERN struct acpi_table_facs *acpi_gbl_FACS;
extern u8 acpi_gbl_permanent_mmap;
/* These addresses are calculated from FADT address values */ /* These addresses are calculated from FADT address values */

2
include/acpi/acpixf.h
View file

@ -48,6 +48,8 @@
#include "actypes.h" #include "actypes.h"
#include "actbl.h" #include "actbl.h"
extern u8 acpi_gbl_permanent_mmap;
/* /*
* Global interfaces * Global interfaces
*/ */