2 files changed, 33 insertions, 50 deletions

diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 53f502d29b32..95650f83ce2e 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -111,12 +111,11 @@ EXPORT_SYMBOL(acpi_get_pci_id);
 int acpi_pci_bind(struct acpi_device *device)
 {
         int result = 0;
-        acpi_status status = AE_OK;
-        struct acpi_pci_data *data = NULL;
-        struct acpi_pci_data *pdata = NULL;
-        char *pathname = NULL;
-        struct acpi_buffer buffer = { 0, NULL };
-        acpi_handle handle = NULL;
+        acpi_status status;
+        struct acpi_pci_data *data;
+        struct acpi_pci_data *pdata;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        acpi_handle handle;
         struct pci_dev *dev;
         struct pci_bus *bus;
 
@@ -124,21 +123,18 @@ int acpi_pci_bind(struct acpi_device *device)
         if (!device || !device->parent)
                 return -EINVAL;
 
-        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
-        if (!pathname)
-                return -ENOMEM;
-        buffer.length = ACPI_PATHNAME_MAX;
-        buffer.pointer = pathname;
-
         data = kzalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
-        if (!data) {
-                kfree(pathname);
+        if (!data)
                 return -ENOMEM;
+
+        status = acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
+        if (ACPI_FAILURE(status)) {
+                kfree(data);
+                return -ENODEV;
         }
 
-        acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Binding PCI device [%s]...\n",
-                          pathname));
+                          (char *)buffer.pointer));
 
         /* 
          * Segment & Bus
@@ -262,7 +258,7 @@ int acpi_pci_bind(struct acpi_device *device)
         }
 
       end:
-        kfree(pathname);
+        kfree(buffer.pointer);
         if (result)
                 kfree(data);
 
@@ -272,25 +268,21 @@ int acpi_pci_bind(struct acpi_device *device)
 static int acpi_pci_unbind(struct acpi_device *device)
 {
         int result = 0;
-        acpi_status status = AE_OK;
-        struct acpi_pci_data *data = NULL;
-        char *pathname = NULL;
-        struct acpi_buffer buffer = { 0, NULL };
+        acpi_status status;
+        struct acpi_pci_data *data;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
 
         if (!device || !device->parent)
                 return -EINVAL;
 
-        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
-        if (!pathname)
-                return -ENOMEM;
+        status = acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
 
-        buffer.length = ACPI_PATHNAME_MAX;
-        buffer.pointer = pathname;
-        acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Unbinding PCI device [%s]...\n",
-                          pathname));
-        kfree(pathname);
+                          (char *) buffer.pointer));
+        kfree(buffer.pointer);
 
         status =
             acpi_get_data(device->handle, acpi_pci_data_handler,
@@ -322,50 +314,44 @@ acpi_pci_bind_root(struct acpi_device *device,
                    struct acpi_pci_id *id, struct pci_bus *bus)
 {
         int result = 0;
-        acpi_status status = AE_OK;
+        acpi_status status;
         struct acpi_pci_data *data = NULL;
-        char *pathname = NULL;
-        struct acpi_buffer buffer = { 0, NULL };
-
-        pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
-        if (!pathname)
-                return -ENOMEM;
-
-        buffer.length = ACPI_PATHNAME_MAX;
-        buffer.pointer = pathname;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
         if (!device || !id || !bus) {
-                kfree(pathname);
                 return -EINVAL;
         }
 
         data = kzalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
-        if (!data) {
-                kfree(pathname);
+        if (!data)
                 return -ENOMEM;
-        }
 
         data->id = *id;
         data->bus = bus;
         device->ops.bind = acpi_pci_bind;
         device->ops.unbind = acpi_pci_unbind;
 
-        acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
+        status = acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
+        if (ACPI_FAILURE(status)) {
+                kfree (data);
+                return -ENODEV;
+        }
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Binding PCI root bridge [%s] to "
-                          "%04x:%02x\n", pathname, id->segment, id->bus));
+                        "%04x:%02x\n", (char *)buffer.pointer,
+                        id->segment, id->bus));
 
         status = acpi_attach_data(device->handle, acpi_pci_data_handler, data);
         if (ACPI_FAILURE(status)) {
                 ACPI_EXCEPTION((AE_INFO, status,
                                 "Unable to attach ACPI-PCI context to device %s",
-                                pathname));
+                                (char *)buffer.pointer));
                 result = -ENODEV;
                 goto end;
         }
 
       end:
-        kfree(pathname);
+        kfree(buffer.pointer);
         if (result != 0)
                 kfree(data);
 
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index 0515e754449d..9116c9862234 100644
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -70,9 +70,6 @@
 #define ACPI_EXPORT_SYMBOL(symbol)  EXPORT_SYMBOL(symbol);
 #define strtoul                     simple_strtoul
 
-/* Full namespace pathname length limit - arbitrary */
-#define ACPI_PATHNAME_MAX              256
-
 #else                           /* !__KERNEL__ */
 
 #include <stdarg.h>