git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
acpi
/
namespace
/
nsnames.c
diff --git
a/drivers/acpi/namespace/nsnames.c
b/drivers/acpi/namespace/nsnames.c
index
639f653
..
97b8332
100644
(file)
--- a/
drivers/acpi/namespace/nsnames.c
+++ b/
drivers/acpi/namespace/nsnames.c
@@
-48,11
+48,6
@@
#define _COMPONENT ACPI_NAMESPACE
ACPI_MODULE_NAME("nsnames")
#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
/*******************************************************************************
*
* FUNCTION: acpi_ns_build_external_path
@@
-67,8
+62,7
@@
acpi_ns_build_external_path(struct acpi_namespace_node *node,
* DESCRIPTION: Generate a full pathaname
*
******************************************************************************/
* DESCRIPTION: Generate a full pathaname
*
******************************************************************************/
-
-static void
+void
acpi_ns_build_external_path(struct acpi_namespace_node *node,
acpi_size size, char *name_buffer)
{
acpi_ns_build_external_path(struct acpi_namespace_node *node,
acpi_size size, char *name_buffer)
{
@@
-138,7
+132,7
@@
char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
char *name_buffer;
acpi_size size;
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 */
/* Calculate required buffer size based on depth below root */
@@
-146,7
+140,7
@@
char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
/* Allocate a buffer to be returned to caller */
/* Allocate a buffer to be returned to caller */
- name_buffer = ACPI_
MEM_CALLOCATE
(size);
+ name_buffer = ACPI_
ALLOCATE_ZEROED
(size);
if (!name_buffer) {
ACPI_ERROR((AE_INFO, "Allocation failure"));
return_PTR(NULL);
if (!name_buffer) {
ACPI_ERROR((AE_INFO, "Allocation failure"));
return_PTR(NULL);
@@
-219,7
+213,7
@@
acpi_ns_handle_to_pathname(acpi_handle target_handle,
struct acpi_namespace_node *node;
acpi_size required_size;
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) {
node = acpi_ns_map_handle_to_node(target_handle);
if (!node) {