projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] x86_64: Support memory hotadd without sparsemem
[powerpc.git]
/
drivers
/
acpi
/
dispatcher
/
dsfield.c
diff --git
a/drivers/acpi/dispatcher/dsfield.c
b/drivers/acpi/dispatcher/dsfield.c
index
2022aea
..
76bc046
100644
(file)
--- a/
drivers/acpi/dispatcher/dsfield.c
+++ b/
drivers/acpi/dispatcher/dsfield.c
@@
-5,7
+5,7
@@
*****************************************************************************/
/*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 200
5
, R. Byron Moore
+ * Copyright (C) 2000 - 200
6
, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-128,7
+128,7
@@
acpi_ds_create_buffer_field(union acpi_parse_object *op,
ACPI_IMODE_LOAD_PASS1, flags, walk_state,
&(node));
if (ACPI_FAILURE(status)) {
ACPI_IMODE_LOAD_PASS1, flags, walk_state,
&(node));
if (ACPI_FAILURE(status)) {
- ACPI_
REPORT_NSERROR
(arg->common.value.string, status);
+ ACPI_
ERROR_NAMESPACE
(arg->common.value.string, status);
return_ACPI_STATUS(status);
}
}
return_ACPI_STATUS(status);
}
}
@@
-232,7
+232,8
@@
acpi_ds_get_field_names(struct acpi_create_field_info *info,
+ (acpi_integer) arg->common.value.size;
if (position > ACPI_UINT32_MAX) {
+ (acpi_integer) arg->common.value.size;
if (position > ACPI_UINT32_MAX) {
- ACPI_REPORT_ERROR(("Bit offset within field too large (> 0xFFFFFFFF)\n"));
+ ACPI_ERROR((AE_INFO,
+ "Bit offset within field too large (> 0xFFFFFFFF)"));
return_ACPI_STATUS(AE_SUPPORT);
}
return_ACPI_STATUS(AE_SUPPORT);
}
@@
-268,8
+269,8
@@
acpi_ds_get_field_names(struct acpi_create_field_info *info,
ACPI_NS_DONT_OPEN_SCOPE,
walk_state, &info->field_node);
if (ACPI_FAILURE(status)) {
ACPI_NS_DONT_OPEN_SCOPE,
walk_state, &info->field_node);
if (ACPI_FAILURE(status)) {
- ACPI_
REPORT_NSERROR
((char *)&arg->named.name,
- status);
+ ACPI_
ERROR_NAMESPACE
((char *)&arg->named.name,
+
status);
if (status != AE_ALREADY_EXISTS) {
return_ACPI_STATUS(status);
}
if (status != AE_ALREADY_EXISTS) {
return_ACPI_STATUS(status);
}
@@
-293,7
+294,11
@@
acpi_ds_get_field_names(struct acpi_create_field_info *info,
+ (acpi_integer) arg->common.value.size;
if (position > ACPI_UINT32_MAX) {
+ (acpi_integer) arg->common.value.size;
if (position > ACPI_UINT32_MAX) {
- ACPI_REPORT_ERROR(("Field [%4.4s] bit offset too large (> 0xFFFFFFFF)\n", (char *)&info->field_node->name));
+ ACPI_ERROR((AE_INFO,
+ "Field [%4.4s] bit offset too large (> 0xFFFFFFFF)",
+ ACPI_CAST_PTR(char,
+ &info->field_node->
+ name)));
return_ACPI_STATUS(AE_SUPPORT);
}
return_ACPI_STATUS(AE_SUPPORT);
}
@@
-302,9
+307,9
@@
acpi_ds_get_field_names(struct acpi_create_field_info *info,
default:
default:
- ACPI_
DEBUG_PRINT((ACPI_DB_ERROR
,
-
"Invalid opcode in field list: %X\n
",
-
arg->common.aml_opcode));
+ ACPI_
ERROR((AE_INFO
,
+
"Invalid opcode in field list: %X
",
+ arg->common.aml_opcode));
return_ACPI_STATUS(AE_AML_BAD_OPCODE);
}
return_ACPI_STATUS(AE_AML_BAD_OPCODE);
}
@@
-349,7
+354,7
@@
acpi_ds_create_field(union acpi_parse_object *op,
ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
walk_state, ®ion_node);
if (ACPI_FAILURE(status)) {
ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
walk_state, ®ion_node);
if (ACPI_FAILURE(status)) {
- ACPI_
REPORT_NSERROR
(arg->common.value.name, status);
+ ACPI_
ERROR_NAMESPACE
(arg->common.value.name, status);
return_ACPI_STATUS(status);
}
}
return_ACPI_STATUS(status);
}
}
@@
-431,8
+436,8
@@
acpi_ds_init_field_objects(union acpi_parse_object *op,
ACPI_NS_ERROR_IF_FOUND,
walk_state, &node);
if (ACPI_FAILURE(status)) {
ACPI_NS_ERROR_IF_FOUND,
walk_state, &node);
if (ACPI_FAILURE(status)) {
- ACPI_
REPORT_NSERROR
((char *)&arg->named.name,
- status);
+ ACPI_
ERROR_NAMESPACE
((char *)&arg->named.name,
+
status);
if (status != AE_ALREADY_EXISTS) {
return_ACPI_STATUS(status);
}
if (status != AE_ALREADY_EXISTS) {
return_ACPI_STATUS(status);
}
@@
-488,7
+493,7
@@
acpi_ds_create_bank_field(union acpi_parse_object *op,
ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
walk_state, ®ion_node);
if (ACPI_FAILURE(status)) {
ACPI_IMODE_EXECUTE, ACPI_NS_SEARCH_PARENT,
walk_state, ®ion_node);
if (ACPI_FAILURE(status)) {
- ACPI_
REPORT_NSERROR
(arg->common.value.name, status);
+ ACPI_
ERROR_NAMESPACE
(arg->common.value.name, status);
return_ACPI_STATUS(status);
}
}
return_ACPI_STATUS(status);
}
}
@@
-502,7
+507,7
@@
acpi_ds_create_bank_field(union acpi_parse_object *op,
ACPI_NS_SEARCH_PARENT, walk_state,
&info.register_node);
if (ACPI_FAILURE(status)) {
ACPI_NS_SEARCH_PARENT, walk_state,
&info.register_node);
if (ACPI_FAILURE(status)) {
- ACPI_
REPORT_NSERROR
(arg->common.value.string, status);
+ ACPI_
ERROR_NAMESPACE
(arg->common.value.string, status);
return_ACPI_STATUS(status);
}
return_ACPI_STATUS(status);
}
@@
-560,7
+565,7
@@
acpi_ds_create_index_field(union acpi_parse_object *op,
ACPI_NS_SEARCH_PARENT, walk_state,
&info.register_node);
if (ACPI_FAILURE(status)) {
ACPI_NS_SEARCH_PARENT, walk_state,
&info.register_node);
if (ACPI_FAILURE(status)) {
- ACPI_
REPORT_NSERROR
(arg->common.value.string, status);
+ ACPI_
ERROR_NAMESPACE
(arg->common.value.string, status);
return_ACPI_STATUS(status);
}
return_ACPI_STATUS(status);
}
@@
-573,7
+578,7
@@
acpi_ds_create_index_field(union acpi_parse_object *op,
ACPI_NS_SEARCH_PARENT, walk_state,
&info.data_register_node);
if (ACPI_FAILURE(status)) {
ACPI_NS_SEARCH_PARENT, walk_state,
&info.data_register_node);
if (ACPI_FAILURE(status)) {
- ACPI_
REPORT_NSERROR
(arg->common.value.string, status);
+ ACPI_
ERROR_NAMESPACE
(arg->common.value.string, status);
return_ACPI_STATUS(status);
}
return_ACPI_STATUS(status);
}