X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Facpi%2Fnamespace%2Fnsnames.c;h=639f653b4b6baadb5e34f3731a001de20fa6334c;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=97b8332c97469c90a25dbc403e3bd098ce4bae9c;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c
index 97b8332c9..639f653b4 100644
--- a/drivers/acpi/namespace/nsnames.c
+++ b/drivers/acpi/namespace/nsnames.c
@@ -48,6 +48,11 @@
 #define _COMPONENT          ACPI_NAMESPACE
 ACPI_MODULE_NAME("nsnames")
 
+/* Local prototypes */
+static void
+acpi_ns_build_external_path(struct acpi_namespace_node *node,
+			    acpi_size size, char *name_buffer);
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_build_external_path
@@ -62,7 +67,8 @@ ACPI_MODULE_NAME("nsnames")
  * DESCRIPTION: Generate a full pathaname
  *
  ******************************************************************************/
-void
+
+static void
 acpi_ns_build_external_path(struct acpi_namespace_node *node,
 			    acpi_size size, char *name_buffer)
 {
@@ -132,7 +138,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
 	char *name_buffer;
 	acpi_size size;
 
-	ACPI_FUNCTION_TRACE_PTR(ns_get_external_pathname, node);
+	ACPI_FUNCTION_TRACE_PTR("ns_get_external_pathname", node);
 
 	/* Calculate required buffer size based on depth below root */
 
@@ -140,7 +146,7 @@ char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
 
 	/* Allocate a buffer to be returned to caller */
 
-	name_buffer = ACPI_ALLOCATE_ZEROED(size);
+	name_buffer = ACPI_MEM_CALLOCATE(size);
 	if (!name_buffer) {
 		ACPI_ERROR((AE_INFO, "Allocation failure"));
 		return_PTR(NULL);
@@ -213,7 +219,7 @@ acpi_ns_handle_to_pathname(acpi_handle target_handle,
 	struct acpi_namespace_node *node;
 	acpi_size required_size;
 
-	ACPI_FUNCTION_TRACE_PTR(ns_handle_to_pathname, target_handle);
+	ACPI_FUNCTION_TRACE_PTR("ns_handle_to_pathname", target_handle);
 
 	node = acpi_ns_map_handle_to_node(target_handle);
 	if (!node) {