aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/namespace/nsobject.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/namespace/nsobject.c')
-rw-r--r--drivers/acpi/namespace/nsobject.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/namespace/nsobject.c
index 39dc87b228fc..aabe8794b908 100644
--- a/drivers/acpi/namespace/nsobject.c
+++ b/drivers/acpi/namespace/nsobject.c
@@ -76,7 +76,7 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
76 union acpi_operand_object *last_obj_desc; 76 union acpi_operand_object *last_obj_desc;
77 acpi_object_type object_type = ACPI_TYPE_ANY; 77 acpi_object_type object_type = ACPI_TYPE_ANY;
78 78
79 ACPI_FUNCTION_TRACE("ns_attach_object"); 79 ACPI_FUNCTION_TRACE(ns_attach_object);
80 80
81 /* 81 /*
82 * Parameter validation 82 * Parameter validation
@@ -85,7 +85,7 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
85 85
86 /* Invalid handle */ 86 /* Invalid handle */
87 87
88 ACPI_ERROR((AE_INFO, "Null named_obj handle")); 88 ACPI_ERROR((AE_INFO, "Null NamedObj handle"));
89 return_ACPI_STATUS(AE_BAD_PARAMETER); 89 return_ACPI_STATUS(AE_BAD_PARAMETER);
90 } 90 }
91 91
@@ -111,7 +111,7 @@ acpi_ns_attach_object(struct acpi_namespace_node *node,
111 111
112 if (node->object == object) { 112 if (node->object == object) {
113 ACPI_DEBUG_PRINT((ACPI_DB_EXEC, 113 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
114 "Obj %p already installed in name_obj %p\n", 114 "Obj %p already installed in NameObj %p\n",
115 object, node)); 115 object, node));
116 116
117 return_ACPI_STATUS(AE_OK); 117 return_ACPI_STATUS(AE_OK);
@@ -204,7 +204,7 @@ void acpi_ns_detach_object(struct acpi_namespace_node *node)
204{ 204{
205 union acpi_operand_object *obj_desc; 205 union acpi_operand_object *obj_desc;
206 206
207 ACPI_FUNCTION_TRACE("ns_detach_object"); 207 ACPI_FUNCTION_TRACE(ns_detach_object);
208 208
209 obj_desc = node->object; 209 obj_desc = node->object;
210 210
@@ -255,7 +255,7 @@ union acpi_operand_object *acpi_ns_get_attached_object(struct
255 acpi_namespace_node 255 acpi_namespace_node
256 *node) 256 *node)
257{ 257{
258 ACPI_FUNCTION_TRACE_PTR("ns_get_attached_object", node); 258 ACPI_FUNCTION_TRACE_PTR(ns_get_attached_object, node);
259 259
260 if (!node) { 260 if (!node) {
261 ACPI_WARNING((AE_INFO, "Null Node ptr")); 261 ACPI_WARNING((AE_INFO, "Null Node ptr"));
@@ -290,7 +290,7 @@ union acpi_operand_object *acpi_ns_get_secondary_object(union
290 acpi_operand_object 290 acpi_operand_object
291 *obj_desc) 291 *obj_desc)
292{ 292{
293 ACPI_FUNCTION_TRACE_PTR("ns_get_secondary_object", obj_desc); 293 ACPI_FUNCTION_TRACE_PTR(ns_get_secondary_object, obj_desc);
294 294
295 if ((!obj_desc) || 295 if ((!obj_desc) ||
296 (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_LOCAL_DATA) || 296 (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_LOCAL_DATA) ||