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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
acpi
/
namespace
/
nsxfname.c
diff --git
a/drivers/acpi/namespace/nsxfname.c
b/drivers/acpi/namespace/nsxfname.c
index
8cd8675
..
978213a
100644
(file)
--- a/
drivers/acpi/namespace/nsxfname.c
+++ b/
drivers/acpi/namespace/nsxfname.c
@@
-42,8
+42,6
@@
* POSSIBILITY OF SUCH DAMAGES.
*/
* POSSIBILITY OF SUCH DAMAGES.
*/
-#include <linux/module.h>
-
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
#include <acpi/acpi.h>
#include <acpi/acnamesp.h>
@@
-114,9
+112,8
@@
acpi_get_handle(acpi_handle parent,
/*
* Find the Node and convert to a handle
*/
/*
* Find the Node and convert to a handle
*/
- status =
- acpi_ns_get_node_by_path(pathname, prefix_node, ACPI_NS_NO_UPSEARCH,
- &node);
+ status = acpi_ns_get_node(prefix_node, pathname, ACPI_NS_NO_UPSEARCH,
+ &node);
*ret_handle = NULL;
if (ACPI_SUCCESS(status)) {
*ret_handle = NULL;
if (ACPI_SUCCESS(status)) {
@@
-126,7
+123,7
@@
acpi_get_handle(acpi_handle parent,
return (status);
}
return (status);
}
-EXPORT_SYMBOL(acpi_get_handle);
+ACPI_EXPORT_SYMBOL(acpi_get_handle)
/******************************************************************************
*
/******************************************************************************
*
@@
-143,7
+140,6
@@
EXPORT_SYMBOL(acpi_get_handle);
* complementary functions.
*
******************************************************************************/
* complementary functions.
*
******************************************************************************/
-
acpi_status
acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer * buffer)
{
acpi_status
acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer * buffer)
{
@@
-162,6
+158,7
@@
acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer * buffer)
}
if (name_type == ACPI_FULL_PATHNAME) {
}
if (name_type == ACPI_FULL_PATHNAME) {
+
/* Get the full pathname (From the namespace root) */
status = acpi_ns_handle_to_pathname(handle, buffer);
/* Get the full pathname (From the namespace root) */
status = acpi_ns_handle_to_pathname(handle, buffer);
@@
-203,7
+200,7
@@
acpi_get_name(acpi_handle handle, u32 name_type, struct acpi_buffer * buffer)
return (status);
}
return (status);
}
-EXPORT_SYMBOL(acpi_get_name);
+ACPI_EXPORT_SYMBOL(acpi_get_name)
/******************************************************************************
*
/******************************************************************************
*
@@
-219,7
+216,6
@@
EXPORT_SYMBOL(acpi_get_name);
* control methods (Such as in the case of a device.)
*
******************************************************************************/
* control methods (Such as in the case of a device.)
*
******************************************************************************/
-
acpi_status
acpi_get_object_info(acpi_handle handle, struct acpi_buffer * buffer)
{
acpi_status
acpi_get_object_info(acpi_handle handle, struct acpi_buffer * buffer)
{
@@
-241,7
+237,7
@@
acpi_get_object_info(acpi_handle handle, struct acpi_buffer * buffer)
return (status);
}
return (status);
}
- info = ACPI_
MEM_CALLOCATE
(sizeof(struct acpi_device_info));
+ info = ACPI_
ALLOCATE_ZEROED
(sizeof(struct acpi_device_info));
if (!info) {
return (AE_NO_MEMORY);
}
if (!info) {
return (AE_NO_MEMORY);
}
@@
-345,11
+341,11
@@
acpi_get_object_info(acpi_handle handle, struct acpi_buffer * buffer)
}
cleanup:
}
cleanup:
- ACPI_
MEM_
FREE(info);
+ ACPI_FREE(info);
if (cid_list) {
if (cid_list) {
- ACPI_
MEM_
FREE(cid_list);
+ ACPI_FREE(cid_list);
}
return (status);
}
}
return (status);
}
-EXPORT_SYMBOL(acpi_get_object_info);
+ACPI_EXPORT_SYMBOL(acpi_get_object_info)