diff options
author | Lin Ming <ming.m.lin@intel.com> | 2008-12-30 20:23:57 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-12-31 01:02:05 -0500 |
commit | 889c78be9e8d84ea7f991b9b868e006cdb8e42b0 (patch) | |
tree | 07c093a6d3c8e5895eb3cf62ca3f676e3cc4d282 /drivers/acpi/osl.c | |
parent | 9b02d6e198d8249246760a93b3adb8df6ecb5204 (diff) |
ACPI: osl.c: replace return_ACPI_STATUS with return
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>
Diffstat (limited to 'drivers/acpi/osl.c')
-rw-r--r-- | drivers/acpi/osl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index c8111424dcb8..6729a4992f2b 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
@@ -726,7 +726,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type, | |||
726 | 726 | ||
727 | dpc = kmalloc(sizeof(struct acpi_os_dpc), GFP_ATOMIC); | 727 | dpc = kmalloc(sizeof(struct acpi_os_dpc), GFP_ATOMIC); |
728 | if (!dpc) | 728 | if (!dpc) |
729 | return_ACPI_STATUS(AE_NO_MEMORY); | 729 | return AE_NO_MEMORY; |
730 | 730 | ||
731 | dpc->function = function; | 731 | dpc->function = function; |
732 | dpc->context = context; | 732 | dpc->context = context; |
@@ -747,7 +747,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type, | |||
747 | status = AE_ERROR; | 747 | status = AE_ERROR; |
748 | kfree(dpc); | 748 | kfree(dpc); |
749 | } | 749 | } |
750 | return_ACPI_STATUS(status); | 750 | return status; |
751 | } | 751 | } |
752 | 752 | ||
753 | acpi_status acpi_os_execute(acpi_execute_type type, | 753 | acpi_status acpi_os_execute(acpi_execute_type type, |