git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull acpica into release branch
[pandora-kernel.git]
/
drivers
/
acpi
/
executer
/
exnames.c
diff --git
a/drivers/acpi/executer/exnames.c
b/drivers/acpi/executer/exnames.c
index
f9bc81c
..
d3d7036
100644
(file)
--- a/
drivers/acpi/executer/exnames.c
+++ b/
drivers/acpi/executer/exnames.c
@@
-77,7
+77,7
@@
static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
char *name_string;
u32 size_needed;
char *name_string;
u32 size_needed;
- ACPI_FUNCTION_TRACE(
"ex_allocate_name_string"
);
+ ACPI_FUNCTION_TRACE(
ex_allocate_name_string
);
/*
* Allow room for all \ and ^ prefixes, all segments and a multi_name_prefix.
/*
* Allow room for all \ and ^ prefixes, all segments and a multi_name_prefix.
@@
-98,7
+98,7
@@
static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs)
* Allocate a buffer for the name.
* This buffer must be deleted by the caller!
*/
* Allocate a buffer for the name.
* This buffer must be deleted by the caller!
*/
- name_string = ACPI_
MEM_
ALLOCATE(size_needed);
+ name_string = ACPI_ALLOCATE(size_needed);
if (!name_string) {
ACPI_ERROR((AE_INFO,
"Could not allocate size %d", size_needed));
if (!name_string) {
ACPI_ERROR((AE_INFO,
"Could not allocate size %d", size_needed));
@@
-162,7
+162,7
@@
static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
u32 index;
char char_buf[5];
u32 index;
char char_buf[5];
- ACPI_FUNCTION_TRACE(
"ex_name_segment"
);
+ ACPI_FUNCTION_TRACE(
ex_name_segment
);
/*
* If first character is a digit, then we know that we aren't looking at a
/*
* If first character is a digit, then we know that we aren't looking at a
@@
-179,7
+179,7
@@
static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string)
for (index = 0;
(index < ACPI_NAME_SIZE)
for (index = 0;
(index < ACPI_NAME_SIZE)
- && (acpi_ut_valid_acpi_char
acter(*aml_address
)); index++) {
+ && (acpi_ut_valid_acpi_char
(*aml_address, 0
)); index++) {
char_buf[index] = *aml_address++;
ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "%c\n", char_buf[index]));
}
char_buf[index] = *aml_address++;
ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "%c\n", char_buf[index]));
}
@@
-253,7
+253,7
@@
acpi_ex_get_name_string(acpi_object_type data_type,
u32 prefix_count = 0;
u8 has_prefix = FALSE;
u32 prefix_count = 0;
u8 has_prefix = FALSE;
- ACPI_FUNCTION_TRACE_PTR(
"ex_get_name_string"
, aml_address);
+ ACPI_FUNCTION_TRACE_PTR(
ex_get_name_string
, aml_address);
if (ACPI_TYPE_LOCAL_REGION_FIELD == data_type ||
ACPI_TYPE_LOCAL_BANK_FIELD == data_type ||
if (ACPI_TYPE_LOCAL_REGION_FIELD == data_type ||
ACPI_TYPE_LOCAL_BANK_FIELD == data_type ||
@@
-277,7
+277,7
@@
acpi_ex_get_name_string(acpi_object_type data_type,
case AML_ROOT_PREFIX:
ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
case AML_ROOT_PREFIX:
ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
- "
root_p
refix(\\) at %p\n",
+ "
RootP
refix(\\) at %p\n",
aml_address));
/*
aml_address));
/*
@@
-295,7
+295,7
@@
acpi_ex_get_name_string(acpi_object_type data_type,
do {
ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
do {
ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
- "
parent_p
refix (^) at %p\n",
+ "
ParentP
refix (^) at %p\n",
aml_address));
aml_address++;
aml_address));
aml_address++;
@@
-319,7
+319,7
@@
acpi_ex_get_name_string(acpi_object_type data_type,
case AML_DUAL_NAME_PREFIX:
ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
case AML_DUAL_NAME_PREFIX:
ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
- "
dual_name_p
refix at %p\n",
+ "
DualNameP
refix at %p\n",
aml_address));
aml_address++;
aml_address));
aml_address++;
@@
-346,7
+346,7
@@
acpi_ex_get_name_string(acpi_object_type data_type,
case AML_MULTI_NAME_PREFIX_OP:
ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
case AML_MULTI_NAME_PREFIX_OP:
ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
- "
multi_name_p
refix at %p\n",
+ "
MultiNameP
refix at %p\n",
aml_address));
/* Fetch count of segments remaining in name path */
aml_address));
/* Fetch count of segments remaining in name path */
@@
-382,7
+382,7
@@
acpi_ex_get_name_string(acpi_object_type data_type,
if (prefix_count == ACPI_UINT32_MAX) {
ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
if (prefix_count == ACPI_UINT32_MAX) {
ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
- "
name_s
eg is \"\\\" followed by NULL\n"));
+ "
NameS
eg is \"\\\" followed by NULL\n"));
}
/* Consume the NULL byte */
}
/* Consume the NULL byte */
@@
-424,7
+424,7
@@
acpi_ex_get_name_string(acpi_object_type data_type,
if (ACPI_FAILURE(status)) {
if (name_string) {
if (ACPI_FAILURE(status)) {
if (name_string) {
- ACPI_
MEM_
FREE(name_string);
+ ACPI_FREE(name_string);
}
return_ACPI_STATUS(status);
}
}
return_ACPI_STATUS(status);
}