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

ACPICA: Cleanup source to reduce differences between Linux and ACPICA. 



This is a cosmetic patch only. Comparison of the resulting binary showed
only line number differences.

This patch does not affect the generation of the Linux binary.
This patch decreases 389 lines of 20121018 divergence.diff.

This patch reduces source code diff caused by the simple code maintenance
work:
1. Deletion of the unused include files.
2. Deletion of the deprecated codes blocks.
3. Repositioning of the code blocks.
4. Replacing the values with the well defined macros.
5. Replacing the types with the equivalent types.

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 56324c10

drivers/acpi/acpica/accommon.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
 *

 * Note: The order of these include files is important.

 */

#include <acpi/acconfig.h>	/* Global configuration constants */

#include "acmacros.h"		/* C macros */

#include "aclocal.h"		/* Internal data types */

#include "acobject.h"		/* ACPI internal object */

drivers/acpi/acpica/acglobal.h

+17 −16
Original line number Diff line number Diff line
@@ -192,14 +192,6 @@ ACPI_EXTERN u8 acpi_gbl_integer_bit_width; 
ACPI_EXTERN u8 acpi_gbl_integer_byte_width;

ACPI_EXTERN u8 acpi_gbl_integer_nybble_width;



/* Mutex for _OSI support */



ACPI_EXTERN acpi_mutex acpi_gbl_osi_mutex;



/* Reader/Writer lock is used for namespace walk and dynamic table unload */



ACPI_EXTERN struct acpi_rw_lock acpi_gbl_namespace_rw_lock;



/*****************************************************************************

 *

 * Mutual exclusion within ACPICA subsystem
@@ -233,6 +225,14 @@ ACPI_EXTERN u8 acpi_gbl_global_lock_pending; 
ACPI_EXTERN acpi_spinlock acpi_gbl_gpe_lock;	/* For GPE data structs and registers */

ACPI_EXTERN acpi_spinlock acpi_gbl_hardware_lock;	/* For ACPI H/W except GPE registers */



/* Mutex for _OSI support */



ACPI_EXTERN acpi_mutex acpi_gbl_osi_mutex;



/* Reader/Writer lock is used for namespace walk and dynamic table unload */



ACPI_EXTERN struct acpi_rw_lock acpi_gbl_namespace_rw_lock;



/*****************************************************************************

 *

 * Miscellaneous globals
@@ -304,6 +304,7 @@ extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS]; 
ACPI_EXTERN struct acpi_memory_list *acpi_gbl_global_list;

ACPI_EXTERN struct acpi_memory_list *acpi_gbl_ns_node_list;

ACPI_EXTERN u8 acpi_gbl_display_final_mem_stats;

ACPI_EXTERN u8 acpi_gbl_disable_mem_tracking;

#endif



/*****************************************************************************
@@ -365,19 +366,18 @@ ACPI_EXTERN u8 acpi_gbl_sleep_type_b; 
 *

 ****************************************************************************/



extern struct acpi_fixed_event_info

    acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS];

ACPI_EXTERN struct acpi_fixed_event_handler

    acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS];

ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head;

ACPI_EXTERN struct acpi_gpe_block_info

*acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS];



#if (!ACPI_REDUCED_HARDWARE)



ACPI_EXTERN u8 acpi_gbl_all_gpes_initialized;

ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head;

ACPI_EXTERN struct acpi_gpe_block_info

    *acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS];

ACPI_EXTERN acpi_gbl_event_handler acpi_gbl_global_event_handler;

ACPI_EXTERN void *acpi_gbl_global_event_handler_context;

ACPI_EXTERN struct acpi_fixed_event_handler

    acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS];

extern struct acpi_fixed_event_info

    acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS];



#endif				/* !ACPI_REDUCED_HARDWARE */
@@ -428,6 +428,7 @@ extern u8 acpi_gbl_db_terminate_threads; 
ACPI_EXTERN u8 acpi_gbl_db_opt_tables;

ACPI_EXTERN u8 acpi_gbl_db_opt_stats;

ACPI_EXTERN u8 acpi_gbl_db_opt_ini_methods;

ACPI_EXTERN u8 acpi_gbl_db_opt_no_region_support;



ACPI_EXTERN char *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS];

ACPI_EXTERN acpi_object_type acpi_gbl_db_arg_types[ACPI_DEBUGGER_MAX_ARGS];

drivers/acpi/acpica/aclocal.h

+0 −5
Original line number Diff line number Diff line
@@ -410,11 +410,6 @@ struct acpi_gpe_notify_info { 
	struct acpi_gpe_notify_info *next;

};



struct acpi_gpe_notify_object {

	struct acpi_namespace_node *node;

	struct acpi_gpe_notify_object *next;

};



/*

 * GPE dispatch info. At any time, the GPE can have at most one type

 * of dispatch - Method, Handler, or Implicit Notify.

drivers/acpi/acpica/amlresrc.h

+6 −0
Original line number Diff line number Diff line
@@ -199,6 +199,12 @@ struct aml_resource_fixed_dma { 
struct aml_resource_large_header {

AML_RESOURCE_LARGE_HEADER_COMMON};



/* General Flags for address space resource descriptors */



#define ACPI_RESOURCE_FLAG_DEC      2

#define ACPI_RESOURCE_FLAG_MIF      4

#define ACPI_RESOURCE_FLAG_MAF      8



struct aml_resource_memory24 {

	AML_RESOURCE_LARGE_HEADER_COMMON u8 flags;

	u16 minimum;

drivers/acpi/acpica/dsobject.c

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state, 
	union acpi_parse_object *parent;

	union acpi_operand_object *obj_desc = NULL;

	acpi_status status = AE_OK;

	unsigned i;

	u32 i;

	u16 index;

	u16 reference_count;

CRA Git | Maintained and supported by SUSTech CRA and CCSE