Commit cd27d79f authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Fix indentation issues for macro invocations. 



During the automatic translation of the upstream ACPICA source code
into Linux kernel source code some extra white spaces are added by
the "indent" program at the beginning of each line which is an
invocation of a macro and there is no ";" at the end of the line.

For this reason, a new mode has been added to the translation scripts
to remove the extra spaces inserted before invoking such macros and add
an empty line between the invocations of such macros (like the other
function declarations).  This new mode is executed after executing
"indent" during the Linux release process.  Consequently, some
existing ACPICA source code in the Linux kernel tree needs to be
adjusted to allow the new scripts to work correctly.

The affected macros and files are:
 1. ACPI_HW_DEPENDENT_RETURN (acpixf.h/acdebug.h/acevents.h):
    This macro is used as a wrapper for hardware dependent APIs to offer
    a stub when the reduced hardware is configured during compilation.
 2. ACPI_EXPORT_SYMBOL (utglobal.c):
    This macro is used by Linux to export symbols to be found by Linux
    modules.  All such invocations are well formatted except those
    exported as global variables.

This can help to reduce the source code differences between Linux
and upstream ACPICA, and also help to automate the release process.
No functional or binary generation changes should result from it.
Lv Zheng.

[rjw: Changelog]
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 4506bf23

drivers/acpi/acpica/acdebug.h

+2 −1
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ void acpi_db_display_handlers(void); 
ACPI_HW_DEPENDENT_RETURN_VOID(void

			      acpi_db_generate_gpe(char *gpe_arg,

						   char *block_arg))



ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_db_generate_sci(void))



/*

drivers/acpi/acpica/acevents.h

+2 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ acpi_status acpi_ev_init_global_lock_handler(void); 


ACPI_HW_DEPENDENT_RETURN_OK(acpi_status

			    acpi_ev_acquire_global_lock(u16 timeout))



ACPI_HW_DEPENDENT_RETURN_OK(acpi_status acpi_ev_release_global_lock(void))

 acpi_status acpi_ev_remove_global_lock_handler(void);

drivers/acpi/acpica/utglobal.c

+3 −0
Original line number Diff line number Diff line
@@ -378,6 +378,9 @@ acpi_status acpi_ut_init_globals(void) 
/* Public globals */



ACPI_EXPORT_SYMBOL(acpi_gbl_FADT)



ACPI_EXPORT_SYMBOL(acpi_dbg_level)



ACPI_EXPORT_SYMBOL(acpi_dbg_layer)



ACPI_EXPORT_SYMBOL(acpi_current_gpe_count)

include/acpi/acpixf.h

+17 −5
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include <acpi/acbuffer.h>



extern u8 acpi_gbl_permanent_mmap;

extern u32 acpi_rsdt_forced;



/*

 * Globals that are publically available
@@ -110,7 +111,6 @@ extern u8 acpi_gbl_disable_ssdt_table_load; 


#endif				/* !ACPI_REDUCED_HARDWARE */



extern u32 acpi_rsdt_forced;

/*

 * Initialization

 */
@@ -130,6 +130,7 @@ acpi_status acpi_terminate(void); 
 * Miscellaneous global interfaces

 */

ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable(void))



ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable(void))

#ifdef ACPI_FUTURE_USAGE

 acpi_status acpi_subsystem_status(void);
@@ -184,6 +185,7 @@ acpi_status 
acpi_get_table_with_size(acpi_string signature,

	       u32 instance, struct acpi_table_header **out_table,

	       acpi_size *tbl_size);



acpi_status

acpi_get_table(acpi_string signature,

	       u32 instance, struct acpi_table_header **out_table);
@@ -274,13 +276,16 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 
				acpi_install_sci_handler(acpi_sci_handler

							 address,

							 void *context))



ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status

				 acpi_remove_sci_handler(acpi_sci_handler

							 address))



ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status

				 acpi_install_global_event_handler

				 (acpi_gbl_event_handler handler,

				  void *context))



ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status

				 acpi_install_fixed_event_handler(u32

								  acpi_event,
@@ -288,10 +293,12 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 
								  handler,

								  void

								  *context))



ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status

				 acpi_remove_fixed_event_handler(u32 acpi_event,

								 acpi_event_handler

								 handler))



ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status

				 acpi_install_gpe_handler(acpi_handle

							  gpe_device,
@@ -300,6 +307,7 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 
							  acpi_gpe_handler

							  address,

							  void *context))



ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status

				 acpi_remove_gpe_handler(acpi_handle gpe_device,

							 u32 gpe_number,
@@ -336,6 +344,7 @@ acpi_status acpi_install_interface_handler(acpi_interface_handler handler); 
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status

				acpi_acquire_global_lock(u16 timeout,

							 u32 *handle))



ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status

				acpi_release_global_lock(u32 handle))
@@ -362,6 +371,7 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 
				acpi_get_event_status(u32 event,

						      acpi_event_status

						      *event_status))



/*

 * General Purpose Event (GPE) Interfaces

 */
@@ -392,10 +402,12 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 
							parent_device,

							acpi_handle gpe_device,

							u32 gpe_number))



ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status

				 acpi_set_gpe_wake_mask(acpi_handle gpe_device,

							u32 gpe_number,

							u8 action))



ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status

				 acpi_get_gpe_status(acpi_handle gpe_device,

						     u32 gpe_number,
@@ -417,6 +429,7 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 
						       *gpe_block_address,

						       u32 register_count,

						       u32 interrupt_number))



ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status

				 acpi_remove_gpe_block(acpi_handle gpe_device))
@@ -506,7 +519,6 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state); 
ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status

				acpi_set_firmware_waking_vector(u32

								physical_address))



#if ACPI_MACHINE_WIDTH == 64

ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status

				acpi_set_firmware_waking_vector64(u64

drivers/acpi/acpica/utcache.c

+1 −1

File changed.

Contains only whitespace changes.

CRA Git | Maintained and supported by SUSTech CRA and CCSE