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

Commit 889c78be authored by Lin Ming's avatar Lin Ming Committed by Len Brown
Browse files

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: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 9b02d6e1

drivers/acpi/osl.c

+2 −2
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type, 


	dpc = kmalloc(sizeof(struct acpi_os_dpc), GFP_ATOMIC);

	if (!dpc)

		return_ACPI_STATUS(AE_NO_MEMORY);

		return AE_NO_MEMORY;



	dpc->function = function;

	dpc->context = context;
@@ -747,7 +747,7 @@ static acpi_status __acpi_os_execute(acpi_execute_type type, 
		status = AE_ERROR;

		kfree(dpc);

	}

	return_ACPI_STATUS(status);

	return status;

}



acpi_status acpi_os_execute(acpi_execute_type type,

include/acpi/acglobal.h

+0 −1
Original line number Diff line number Diff line
@@ -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_table_fadt acpi_gbl_FADT;

ACPI_EXTERN struct acpi_table_facs *acpi_gbl_FACS;

extern u8 acpi_gbl_permanent_mmap;



/* These addresses are calculated from FADT address values */

include/acpi/acpixf.h

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ 
#include "actypes.h"

#include "actbl.h"



extern u8 acpi_gbl_permanent_mmap;



/*

 * Global interfaces

 */