diff options
Diffstat (limited to 'drivers/acpi/namespace/nsobject.c')
-rw-r--r-- | drivers/acpi/namespace/nsobject.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/namespace/nsobject.c index 86113093f7b..10ae6292bca 100644 --- a/drivers/acpi/namespace/nsobject.c +++ b/drivers/acpi/namespace/nsobject.c | |||
@@ -84,22 +84,23 @@ acpi_ns_attach_object(struct acpi_namespace_node *node, | |||
84 | if (!node) { | 84 | if (!node) { |
85 | /* Invalid handle */ | 85 | /* Invalid handle */ |
86 | 86 | ||
87 | ACPI_REPORT_ERROR(("Null named_obj handle\n")); | 87 | ACPI_ERROR((AE_INFO, "Null named_obj handle")); |
88 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 88 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
89 | } | 89 | } |
90 | 90 | ||
91 | if (!object && (ACPI_TYPE_ANY != type)) { | 91 | if (!object && (ACPI_TYPE_ANY != type)) { |
92 | /* Null object */ | 92 | /* Null object */ |
93 | 93 | ||
94 | ACPI_REPORT_ERROR(("Null object, but type not ACPI_TYPE_ANY\n")); | 94 | ACPI_ERROR((AE_INFO, |
95 | "Null object, but type not ACPI_TYPE_ANY")); | ||
95 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 96 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
96 | } | 97 | } |
97 | 98 | ||
98 | if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) { | 99 | if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) { |
99 | /* Not a name handle */ | 100 | /* Not a name handle */ |
100 | 101 | ||
101 | ACPI_REPORT_ERROR(("Invalid handle %p [%s]\n", | 102 | ACPI_ERROR((AE_INFO, "Invalid handle %p [%s]", |
102 | node, acpi_ut_get_descriptor_name(node))); | 103 | node, acpi_ut_get_descriptor_name(node))); |
103 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 104 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
104 | } | 105 | } |
105 | 106 | ||
@@ -254,7 +255,7 @@ union acpi_operand_object *acpi_ns_get_attached_object(struct | |||
254 | ACPI_FUNCTION_TRACE_PTR("ns_get_attached_object", node); | 255 | ACPI_FUNCTION_TRACE_PTR("ns_get_attached_object", node); |
255 | 256 | ||
256 | if (!node) { | 257 | if (!node) { |
257 | ACPI_REPORT_WARNING(("Null Node ptr\n")); | 258 | ACPI_WARNING((AE_INFO, "Null Node ptr")); |
258 | return_PTR(NULL); | 259 | return_PTR(NULL); |
259 | } | 260 | } |
260 | 261 | ||