redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

ACPICA: Fix divergences of definition conflicts.

Browse source 
There are conflicts in the "acpi_device_id*" definitions between the
Linux and the ACPICA.  The definitions of acpi_device_id* in ACPICA
have been changed to the "acpi_pnp_device_id*".  This patch changes
the corresponding "acpica_device_id*" definitiions in the Linux.

This patch will not affect the generated vmlinx binary.
This will decrease 298 lines of 20120913 divergence.diff.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Lv Zheng 2012-10-31 02:25:24 +00:00 committed by Rafael J. Wysocki
parent f540fadf29
commit 78e25fef27
7 changed files with 48 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/acpi/acpica/acutils.h
View file

@ -355,15 +355,15 @@ acpi_ut_execute_power_methods(struct acpi_namespace_node *device_node,
*/ */
acpi_status acpi_status
acpi_ut_execute_HID(struct acpi_namespace_node *device_node, acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
struct acpica_device_id ** return_id); struct acpi_pnp_device_id ** return_id);
acpi_status acpi_status
acpi_ut_execute_UID(struct acpi_namespace_node *device_node, acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
struct acpica_device_id ** return_id); struct acpi_pnp_device_id ** return_id);
acpi_status acpi_status
acpi_ut_execute_CID(struct acpi_namespace_node *device_node, acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
struct acpica_device_id_list ** return_cid_list); struct acpi_pnp_device_id_list ** return_cid_list);
/* /*
* utlock - reader/writer locks * utlock - reader/writer locks

4
drivers/acpi/acpica/evrgnini.c
View file

@ -350,8 +350,8 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node) static u8 acpi_ev_is_pci_root_bridge(struct acpi_namespace_node *node)
{ {
acpi_status status; acpi_status status;
struct acpica_device_id *hid; struct acpi_pnp_device_id *hid;
struct acpica_device_id_list *cid; struct acpi_pnp_device_id_list *cid;
u32 i; u32 i;
u8 match; u8 match;

4
drivers/acpi/acpica/nsxfeval.c
View file

@ -542,8 +542,8 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
acpi_status status; acpi_status status;
struct acpi_namespace_node *node; struct acpi_namespace_node *node;
u32 flags; u32 flags;
struct acpica_device_id *hid; struct acpi_pnp_device_id *hid;
struct acpica_device_id_list *cid; struct acpi_pnp_device_id_list *cid;
u32 i; u32 i;
u8 found; u8 found;
int no_match; int no_match;

28
drivers/acpi/acpica/nsxfname.c
View file

@ -53,8 +53,8 @@
ACPI_MODULE_NAME("nsxfname") ACPI_MODULE_NAME("nsxfname")
/* Local prototypes */ /* Local prototypes */
static char *acpi_ns_copy_device_id(struct acpica_device_id *dest, static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest,
struct acpica_device_id *source, struct acpi_pnp_device_id *source,
char *string_area); char *string_area);
/****************************************************************************** /******************************************************************************
@ -219,20 +219,20 @@ ACPI_EXPORT_SYMBOL(acpi_get_name)
* *
* FUNCTION: acpi_ns_copy_device_id * FUNCTION: acpi_ns_copy_device_id
* *
* PARAMETERS: dest - Pointer to the destination DEVICE_ID * PARAMETERS: dest - Pointer to the destination PNP_DEVICE_ID
* source - Pointer to the source DEVICE_ID * source - Pointer to the source PNP_DEVICE_ID
* string_area - Pointer to where to copy the dest string * string_area - Pointer to where to copy the dest string
* *
* RETURN: Pointer to the next string area * RETURN: Pointer to the next string area
* *
* DESCRIPTION: Copy a single DEVICE_ID, including the string data. * DESCRIPTION: Copy a single PNP_DEVICE_ID, including the string data.
* *
******************************************************************************/ ******************************************************************************/
static char *acpi_ns_copy_device_id(struct acpica_device_id *dest, static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest,
struct acpica_device_id *source, struct acpi_pnp_device_id *source,
char *string_area) char *string_area)
{ {
/* Create the destination DEVICE_ID */ /* Create the destination PNP_DEVICE_ID */
dest->string = string_area; dest->string = string_area;
dest->length = source->length; dest->length = source->length;
@ -269,9 +269,9 @@ acpi_get_object_info(acpi_handle handle,
{ {
struct acpi_namespace_node *node; struct acpi_namespace_node *node;
struct acpi_device_info *info; struct acpi_device_info *info;
struct acpica_device_id_list *cid_list = NULL; struct acpi_pnp_device_id_list *cid_list = NULL;
struct acpica_device_id *hid = NULL; struct acpi_pnp_device_id *hid = NULL;
struct acpica_device_id *uid = NULL; struct acpi_pnp_device_id *uid = NULL;
char *next_id_string; char *next_id_string;
acpi_object_type type; acpi_object_type type;
acpi_name name; acpi_name name;
@ -348,7 +348,7 @@ acpi_get_object_info(acpi_handle handle,
info_size += info_size +=
(cid_list->list_size - (cid_list->list_size -
sizeof(struct acpica_device_id_list)); sizeof(struct acpi_pnp_device_id_list));
valid |= ACPI_VALID_CID; valid |= ACPI_VALID_CID;
} }
} }
@ -418,11 +418,11 @@ acpi_get_object_info(acpi_handle handle,
next_id_string = ACPI_CAST_PTR(char, info->compatible_id_list.ids); next_id_string = ACPI_CAST_PTR(char, info->compatible_id_list.ids);
if (cid_list) { if (cid_list) {
/* Point past the CID DEVICE_ID array */ /* Point past the CID PNP_DEVICE_ID array */
next_id_string += next_id_string +=
((acpi_size) cid_list->count * ((acpi_size) cid_list->count *
sizeof(struct acpica_device_id)); sizeof(struct acpi_pnp_device_id));
} }
/* /*

37
drivers/acpi/acpica/utids.c
View file

@ -67,10 +67,10 @@ ACPI_MODULE_NAME("utids")
******************************************************************************/ ******************************************************************************/
acpi_status acpi_status
acpi_ut_execute_HID(struct acpi_namespace_node *device_node, acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
struct acpica_device_id **return_id) struct acpi_pnp_device_id **return_id)
{ {
union acpi_operand_object *obj_desc; union acpi_operand_object *obj_desc;
struct acpica_device_id *hid; struct acpi_pnp_device_id *hid;
u32 length; u32 length;
acpi_status status; acpi_status status;
@ -94,16 +94,17 @@ acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
/* Allocate a buffer for the HID */ /* Allocate a buffer for the HID */
hid = hid =
ACPI_ALLOCATE_ZEROED(sizeof(struct acpica_device_id) + ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pnp_device_id) +
(acpi_size) length); (acpi_size) length);
if (!hid) { if (!hid) {
status = AE_NO_MEMORY; status = AE_NO_MEMORY;
goto cleanup; goto cleanup;
} }
/* Area for the string starts after DEVICE_ID struct */ /* Area for the string starts after PNP_DEVICE_ID struct */
hid->string = ACPI_ADD_PTR(char, hid, sizeof(struct acpica_device_id)); hid->string =
ACPI_ADD_PTR(char, hid, sizeof(struct acpi_pnp_device_id));
/* Convert EISAID to a string or simply copy existing string */ /* Convert EISAID to a string or simply copy existing string */
@ -144,10 +145,10 @@ cleanup:
acpi_status acpi_status
acpi_ut_execute_UID(struct acpi_namespace_node *device_node, acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
struct acpica_device_id **return_id) struct acpi_pnp_device_id **return_id)
{ {
union acpi_operand_object *obj_desc; union acpi_operand_object *obj_desc;
struct acpica_device_id *uid; struct acpi_pnp_device_id *uid;
u32 length; u32 length;
acpi_status status; acpi_status status;
@ -171,16 +172,17 @@ acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
/* Allocate a buffer for the UID */ /* Allocate a buffer for the UID */
uid = uid =
ACPI_ALLOCATE_ZEROED(sizeof(struct acpica_device_id) + ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pnp_device_id) +
(acpi_size) length); (acpi_size) length);
if (!uid) { if (!uid) {
status = AE_NO_MEMORY; status = AE_NO_MEMORY;
goto cleanup; goto cleanup;
} }
/* Area for the string starts after DEVICE_ID struct */ /* Area for the string starts after PNP_DEVICE_ID struct */
uid->string = ACPI_ADD_PTR(char, uid, sizeof(struct acpica_device_id)); uid->string =
ACPI_ADD_PTR(char, uid, sizeof(struct acpi_pnp_device_id));
/* Convert an Integer to string, or just copy an existing string */ /* Convert an Integer to string, or just copy an existing string */
@ -226,11 +228,11 @@ cleanup:
acpi_status acpi_status
acpi_ut_execute_CID(struct acpi_namespace_node *device_node, acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
struct acpica_device_id_list **return_cid_list) struct acpi_pnp_device_id_list **return_cid_list)
{ {
union acpi_operand_object **cid_objects; union acpi_operand_object **cid_objects;
union acpi_operand_object *obj_desc; union acpi_operand_object *obj_desc;
struct acpica_device_id_list *cid_list; struct acpi_pnp_device_id_list *cid_list;
char *next_id_string; char *next_id_string;
u32 string_area_size; u32 string_area_size;
u32 length; u32 length;
@ -288,11 +290,12 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
/* /*
* Now that we know the length of the CIDs, allocate return buffer: * Now that we know the length of the CIDs, allocate return buffer:
* 1) Size of the base structure + * 1) Size of the base structure +
* 2) Size of the CID DEVICE_ID array + * 2) Size of the CID PNP_DEVICE_ID array +
* 3) Size of the actual CID strings * 3) Size of the actual CID strings
*/ */
cid_list_size = sizeof(struct acpica_device_id_list) + cid_list_size = sizeof(struct acpi_pnp_device_id_list) +
((count - 1) * sizeof(struct acpica_device_id)) + string_area_size; ((count - 1) * sizeof(struct acpi_pnp_device_id)) +
string_area_size;
cid_list = ACPI_ALLOCATE_ZEROED(cid_list_size); cid_list = ACPI_ALLOCATE_ZEROED(cid_list_size);
if (!cid_list) { if (!cid_list) {
@ -300,10 +303,10 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
goto cleanup; goto cleanup;
} }
/* Area for CID strings starts after the CID DEVICE_ID array */ /* Area for CID strings starts after the CID PNP_DEVICE_ID array */
next_id_string = ACPI_CAST_PTR(char, cid_list->ids) + next_id_string = ACPI_CAST_PTR(char, cid_list->ids) +
((acpi_size) count * sizeof(struct acpica_device_id)); ((acpi_size) count * sizeof(struct acpi_pnp_device_id));
/* Copy/convert the CIDs to the return buffer */ /* Copy/convert the CIDs to the return buffer */

2
drivers/acpi/scan.c
View file

@ -1185,7 +1185,7 @@ static void acpi_device_set_id(struct acpi_device *device)
{ {
acpi_status status; acpi_status status;
struct acpi_device_info *info; struct acpi_device_info *info;
struct acpica_device_id_list *cid_list; struct acpi_pnp_device_id_list *cid_list;
int i; int i;
switch (device->device_type) { switch (device->device_type) {

12
include/acpi/actypes.h
View file

@ -1020,15 +1020,15 @@ u32 (*acpi_interface_handler) (acpi_string interface_name, u32 supported);
/* Structures used for device/processor HID, UID, CID */ /* Structures used for device/processor HID, UID, CID */
struct acpica_device_id { struct acpi_pnp_device_id {
u32 length; /* Length of string + null */ u32 length; /* Length of string + null */
char *string; char *string;
}; };
struct acpica_device_id_list { struct acpi_pnp_device_id_list {
u32 count; /* Number of IDs in Ids array */ u32 count; /* Number of IDs in Ids array */
u32 list_size; /* Size of list, including ID strings */ u32 list_size; /* Size of list, including ID strings */
struct acpica_device_id ids[1]; /* ID array */ struct acpi_pnp_device_id ids[1]; /* ID array */
}; };
/* /*
@ -1046,9 +1046,9 @@ struct acpi_device_info {
u8 lowest_dstates[5]; /* _sx_w values: 0xFF indicates not valid */ u8 lowest_dstates[5]; /* _sx_w values: 0xFF indicates not valid */
u32 current_status; /* _STA value */ u32 current_status; /* _STA value */
u64 address; /* _ADR value */ u64 address; /* _ADR value */
struct acpica_device_id hardware_id; /* _HID value */ struct acpi_pnp_device_id hardware_id; /* _HID value */
struct acpica_device_id unique_id; /* _UID value */ struct acpi_pnp_device_id unique_id; /* _UID value */
struct acpica_device_id_list compatible_id_list; /* _CID list <must be last> */ struct acpi_pnp_device_id_list compatible_id_list; /* _CID list <must be last> */
}; };
/* Values for Flags field above (acpi_get_object_info) */ /* Values for Flags field above (acpi_get_object_info) */