Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
[pandora-kernel.git] / drivers / acpi / pci_bind.c
index 5148f3c..55f57a6 100644 (file)
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
-
 #define _COMPONENT             ACPI_PCI_COMPONENT
-ACPI_MODULE_NAME               ("pci_bind")
+ACPI_MODULE_NAME("pci_bind")
 
 struct acpi_pci_data {
-       struct acpi_pci_id      id;
-       struct pci_bus          *bus;
-       struct pci_dev          *dev;
+       struct acpi_pci_id id;
+       struct pci_bus *bus;
+       struct pci_dev *dev;
 };
 
-
-void
-acpi_pci_data_handler (
-       acpi_handle             handle,
-       u32                     function,
-       void                    *context)
+static void acpi_pci_data_handler(acpi_handle handle, u32 function,
+                                 void *context)
 {
-       ACPI_FUNCTION_TRACE("acpi_pci_data_handler");
 
        /* TBD: Anything we need to do here? */
 
-       return_VOID;
+       return;
 }
 
-
 /**
  * acpi_get_pci_id
  * ------------------
@@ -67,104 +60,95 @@ acpi_pci_data_handler (
  * to resolve PCI information for ACPI-PCI devices defined in the namespace.
  * This typically occurs when resolving PCI operation region information.
  */
-acpi_status
-acpi_get_pci_id (
-       acpi_handle             handle,
-       struct acpi_pci_id      *id)
+acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id)
 {
-       int                     result = 0;
-       acpi_status             status = AE_OK;
-       struct acpi_device      *device = NULL;
-       struct acpi_pci_data    *data = NULL;
+       int result = 0;
+       acpi_status status = AE_OK;
+       struct acpi_device *device = NULL;
+       struct acpi_pci_data *data = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_get_pci_id");
 
        if (!id)
-               return_ACPI_STATUS(AE_BAD_PARAMETER);
+               return AE_BAD_PARAMETER;
 
        result = acpi_bus_get_device(handle, &device);
        if (result) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 
-                       "Invalid ACPI Bus context for device %s\n",
-                       acpi_device_bid(device)));
-               return_ACPI_STATUS(AE_NOT_EXIST);
+               printk(KERN_ERR PREFIX
+                           "Invalid ACPI Bus context for device %s\n",
+                           acpi_device_bid(device));
+               return AE_NOT_EXIST;
        }
 
-       status = acpi_get_data(handle, acpi_pci_data_handler, (void**) &data);
+       status = acpi_get_data(handle, acpi_pci_data_handler, (void **)&data);
        if (ACPI_FAILURE(status) || !data) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 
-                       "Invalid ACPI-PCI context for device %s\n",
-                       acpi_device_bid(device)));
-               return_ACPI_STATUS(status);
+               ACPI_EXCEPTION((AE_INFO, status,
+                               "Invalid ACPI-PCI context for device %s",
+                               acpi_device_bid(device)));
+               return status;
        }
 
        *id = data->id;
-       
+
        /*
-       id->segment = data->id.segment;
-       id->bus = data->id.bus;
-       id->device = data->id.device;
-       id->function = data->id.function;
-       */
-
-       ACPI_DEBUG_PRINT((ACPI_DB_INFO, 
-               "Device %s has PCI address %02x:%02x:%02x.%02x\n", 
-               acpi_device_bid(device), id->segment, id->bus, 
-               id->device, id->function));
-
-       return_ACPI_STATUS(AE_OK);
+          id->segment = data->id.segment;
+          id->bus = data->id.bus;
+          id->device = data->id.device;
+          id->function = data->id.function;
+        */
+
+       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                         "Device %s has PCI address %02x:%02x:%02x.%02x\n",
+                         acpi_device_bid(device), id->segment, id->bus,
+                         id->device, id->function));
+
+       return AE_OK;
 }
+
 EXPORT_SYMBOL(acpi_get_pci_id);
 
-       
-int
-acpi_pci_bind (
-       struct acpi_device      *device)
+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;
-       struct pci_dev          *dev;
-       struct pci_bus          *bus;
-
-       ACPI_FUNCTION_TRACE("acpi_pci_bind");
+       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;
+       struct pci_dev *dev;
+       struct pci_bus *bus;
+
 
        if (!device || !device->parent)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
-       pathname = kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
-       if(!pathname)
-               return_VALUE(-ENOMEM);
-       memset(pathname, 0, ACPI_PATHNAME_MAX);
+       pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
+       if (!pathname)
+               return -ENOMEM;
        buffer.length = ACPI_PATHNAME_MAX;
        buffer.pointer = pathname;
 
-       data = kmalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
-       if (!data){
-               kfree (pathname);
-               return_VALUE(-ENOMEM);
+       data = kzalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
+       if (!data) {
+               kfree(pathname);
+               return -ENOMEM;
        }
-       memset(data, 0, sizeof(struct acpi_pci_data));
 
        acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
-       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Binding PCI device [%s]...\n", 
-               pathname));
+       ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Binding PCI device [%s]...\n",
+                         pathname));
 
        /* 
         * Segment & Bus
         * -------------
         * These are obtained via the parent device's ACPI-PCI context.
         */
-       status = acpi_get_data(device->parent->handle, acpi_pci_data_handler, 
-               (void**) &pdata);
+       status = acpi_get_data(device->parent->handle, acpi_pci_data_handler,
+                              (void **)&pdata);
        if (ACPI_FAILURE(status) || !pdata || !pdata->bus) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 
-                       "Invalid ACPI-PCI context for parent device %s\n",
-                       acpi_device_bid(device->parent)));
+               ACPI_EXCEPTION((AE_INFO, status,
+                               "Invalid ACPI-PCI context for parent device %s",
+                               acpi_device_bid(device->parent)));
                result = -ENODEV;
                goto end;
        }
@@ -181,8 +165,8 @@ acpi_pci_bind (
        data->id.function = device->pnp.bus_address & 0xFFFF;
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "...to %02x:%02x:%02x.%02x\n",
-               data->id.segment, data->id.bus, data->id.device, 
-               data->id.function));
+                         data->id.segment, data->id.bus, data->id.device,
+                         data->id.function));
 
        /*
         * TBD: Support slot devices (e.g. function=0xFFFF).
@@ -202,25 +186,25 @@ acpi_pci_bind (
        if (bus) {
                list_for_each_entry(dev, &bus->devices, bus_list) {
                        if (dev->devfn == PCI_DEVFN(data->id.device,
-                                               data->id.function)) {
+                                                   data->id.function)) {
                                data->dev = dev;
                                break;
                        }
                }
        }
        if (!data->dev) {
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO, 
-                       "Device %02x:%02x:%02x.%02x not present in PCI namespace\n",
-                       data->id.segment, data->id.bus, 
-                       data->id.device, data->id.function));
+               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                 "Device %02x:%02x:%02x.%02x not present in PCI namespace\n",
+                                 data->id.segment, data->id.bus,
+                                 data->id.device, data->id.function));
                result = -ENODEV;
                goto end;
        }
        if (!data->dev->bus) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 
-                       "Device %02x:%02x:%02x.%02x has invalid 'bus' field\n",
-                       data->id.segment, data->id.bus, 
-                       data->id.device, data->id.function));
+               printk(KERN_ERR PREFIX
+                           "Device %02x:%02x:%02x.%02x has invalid 'bus' field\n",
+                           data->id.segment, data->id.bus,
+                           data->id.device, data->id.function);
                result = -ENODEV;
                goto end;
        }
@@ -232,10 +216,10 @@ acpi_pci_bind (
         * facilitate callbacks for all of its children.
         */
        if (data->dev->subordinate) {
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO, 
-                       "Device %02x:%02x:%02x.%02x is a PCI bridge\n",
-                       data->id.segment, data->id.bus, 
-                       data->id.device, data->id.function));
+               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                 "Device %02x:%02x:%02x.%02x is a PCI bridge\n",
+                                 data->id.segment, data->id.bus,
+                                 data->id.device, data->id.function));
                data->bus = data->dev->subordinate;
                device->ops.bind = acpi_pci_bind;
                device->ops.unbind = acpi_pci_unbind;
@@ -248,9 +232,9 @@ acpi_pci_bind (
         */
        status = acpi_attach_data(device->handle, acpi_pci_data_handler, data);
        if (ACPI_FAILURE(status)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                       "Unable to attach ACPI-PCI context to device %s\n",
-                       acpi_device_bid(device)));
+               ACPI_EXCEPTION((AE_INFO, status,
+                               "Unable to attach ACPI-PCI context to device %s",
+                               acpi_device_bid(device)));
                result = -ENODEV;
                goto end;
        }
@@ -267,62 +251,61 @@ acpi_pci_bind (
         */
        status = acpi_get_handle(device->handle, METHOD_NAME__PRT, &handle);
        if (ACPI_SUCCESS(status)) {
-               if (data->bus)                              /* PCI-PCI bridge */
-                       acpi_pci_irq_add_prt(device->handle, data->id.segment, 
-                               data->bus->number);
-               else                                 /* non-bridge PCI device */
+               if (data->bus)  /* PCI-PCI bridge */
                        acpi_pci_irq_add_prt(device->handle, data->id.segment,
-                               data->id.bus);
+                                            data->bus->number);
+               else            /* non-bridge PCI device */
+                       acpi_pci_irq_add_prt(device->handle, data->id.segment,
+                                            data->id.bus);
        }
 
-end:
+      end:
        kfree(pathname);
        if (result)
                kfree(data);
 
-       return_VALUE(result);
+       return result;
 }
 
-int acpi_pci_unbind(
-       struct acpi_device      *device)
+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};
+       int result = 0;
+       acpi_status status = AE_OK;
+       struct acpi_pci_data *data = NULL;
+       char *pathname = NULL;
+       struct acpi_buffer buffer = { 0, NULL };
 
-       ACPI_FUNCTION_TRACE("acpi_pci_unbind");
 
        if (!device || !device->parent)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
-       pathname = (char *) kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
-       if(!pathname)
-               return_VALUE(-ENOMEM);
-       memset(pathname, 0, ACPI_PATHNAME_MAX);
+       pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
+       if (!pathname)
+               return -ENOMEM;
 
        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));
+                         pathname));
        kfree(pathname);
 
-       status = acpi_get_data(device->handle, acpi_pci_data_handler, (void**)&data);
+       status =
+           acpi_get_data(device->handle, acpi_pci_data_handler,
+                         (void **)&data);
        if (ACPI_FAILURE(status)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                       "Unable to get data from device %s\n",
-                       acpi_device_bid(device)));
+               ACPI_EXCEPTION((AE_INFO, status,
+                               "Unable to get data from device %s",
+                               acpi_device_bid(device)));
                result = -ENODEV;
                goto end;
        }
 
        status = acpi_detach_data(device->handle, acpi_pci_data_handler);
        if (ACPI_FAILURE(status)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                       "Unable to detach data from device %s\n",
-                       acpi_device_bid(device)));
+               ACPI_EXCEPTION((AE_INFO, status,
+                               "Unable to detach data from device %s",
+                               acpi_device_bid(device)));
                result = -ENODEV;
                goto end;
        }
@@ -331,43 +314,37 @@ int acpi_pci_unbind(
        }
        kfree(data);
 
-end:
-       return_VALUE(result);
+      end:
+       return result;
 }
 
-int 
-acpi_pci_bind_root (
-       struct acpi_device      *device,
-       struct acpi_pci_id      *id,
-       struct pci_bus          *bus) 
+int
+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;
-       struct acpi_pci_data    *data = NULL;
-       char                    *pathname = NULL;
-       struct acpi_buffer      buffer = {0, NULL};
-
-       ACPI_FUNCTION_TRACE("acpi_pci_bind_root");
+       int result = 0;
+       acpi_status status = AE_OK;
+       struct acpi_pci_data *data = NULL;
+       char *pathname = NULL;
+       struct acpi_buffer buffer = { 0, NULL };
 
-       pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
-       if(!pathname)
-               return_VALUE(-ENOMEM);
-       memset(pathname, 0, ACPI_PATHNAME_MAX);
+       pathname = kzalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
+       if (!pathname)
+               return -ENOMEM;
 
        buffer.length = ACPI_PATHNAME_MAX;
        buffer.pointer = pathname;
 
-       if (!device || !id || !bus){
+       if (!device || !id || !bus) {
                kfree(pathname);
-               return_VALUE(-EINVAL);
+               return -EINVAL;
        }
 
-       data = kmalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
-       if (!data){
+       data = kzalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
+       if (!data) {
                kfree(pathname);
-               return_VALUE(-ENOMEM);
+               return -ENOMEM;
        }
-       memset(data, 0, sizeof(struct acpi_pci_data));
 
        data->id = *id;
        data->bus = bus;
@@ -377,21 +354,21 @@ acpi_pci_bind_root (
        acpi_get_name(device->handle, ACPI_FULL_PATHNAME, &buffer);
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Binding PCI root bridge [%s] to "
-               "%02x:%02x\n", pathname, id->segment, id->bus));
+                         "%02x:%02x\n", pathname, id->segment, id->bus));
 
        status = acpi_attach_data(device->handle, acpi_pci_data_handler, data);
        if (ACPI_FAILURE(status)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                       "Unable to attach ACPI-PCI context to device %s\n",
-                       pathname));
+               ACPI_EXCEPTION((AE_INFO, status,
+                               "Unable to attach ACPI-PCI context to device %s",
+                               pathname));
                result = -ENODEV;
                goto end;
        }
 
-end:
+      end:
        kfree(pathname);
        if (result != 0)
                kfree(data);
 
-       return_VALUE(result);
+       return result;
 }