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
Merge branch 'origin'
[pandora-kernel.git]
/
drivers
/
acpi
/
parser
/
psargs.c
diff --git
a/drivers/acpi/parser/psargs.c
b/drivers/acpi/parser/psargs.c
index
e6d4cb9
..
de573be
100644
(file)
--- a/
drivers/acpi/parser/psargs.c
+++ b/
drivers/acpi/parser/psargs.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
@@
-298,7
+298,9
@@
acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
acpi_ps_append_arg(arg, name_op);
if (!method_desc) {
acpi_ps_append_arg(arg, name_op);
if (!method_desc) {
- ACPI_REPORT_ERROR(("ps_get_next_namepath: Control Method %p has no attached object\n", node));
+ ACPI_ERROR((AE_INFO,
+ "Control Method %p has no attached object",
+ node));
return_ACPI_STATUS(AE_AML_INTERNAL);
}
return_ACPI_STATUS(AE_AML_INTERNAL);
}
@@
-348,7
+350,7
@@
acpi_ps_get_next_namepath(struct acpi_walk_state *walk_state,
/* Final exception check (may have been changed from code above) */
if (ACPI_FAILURE(status)) {
/* Final exception check (may have been changed from code above) */
if (ACPI_FAILURE(status)) {
- ACPI_
REPORT_NSERROR
(path, status);
+ ACPI_
ERROR_NAMESPACE
(path, status);
if ((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) ==
ACPI_PARSE_EXECUTE) {
if ((walk_state->parse_flags & ACPI_PARSE_MODE_MASK) ==
ACPI_PARSE_EXECUTE) {
@@
-451,7
+453,7
@@
acpi_ps_get_next_simple_arg(struct acpi_parse_state *parser_state,
default:
default:
- ACPI_
REPORT_ERROR(("Invalid arg_type %X\n
", arg_type));
+ ACPI_
ERROR((AE_INFO, "Invalid arg_type %X
", arg_type));
return_VOID;
}
return_VOID;
}
@@
-709,7
+711,7
@@
acpi_ps_get_next_arg(struct acpi_walk_state *walk_state,
default:
default:
- ACPI_
REPORT_ERROR(("Invalid arg_type: %X\n
", arg_type));
+ ACPI_
ERROR((AE_INFO, "Invalid arg_type: %X
", arg_type));
status = AE_AML_OPERAND_TYPE;
break;
}
status = AE_AML_OPERAND_TYPE;
break;
}