ACPI: delete tracing macros from drivers/acpi/*.c

[karo-tx-linux.git] / drivers / acpi / pci_bind.c

diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 3e7d0191c75c7ed494024c1e4c8443f541638b8d..1e2ae6e7a7e47d4e24e1e9af051d447d32178e39 100644 (file)
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -47,11 +47,10 @@ struct acpi_pci_data {
 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;
 }
 
 /**
@@ -68,17 +67,16 @@ acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id)
        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) {
                printk(KERN_ERR PREFIX
                            "Invalid ACPI Bus context for device %s\n",
                            acpi_device_bid(device));
-               return_ACPI_STATUS(AE_NOT_EXIST);
+               return AE_NOT_EXIST;
        }
 
        status = acpi_get_data(handle, acpi_pci_data_handler, (void **)&data);
@@ -86,7 +84,7 @@ acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id)
                ACPI_EXCEPTION((AE_INFO, status,
                                "Invalid ACPI-PCI context for device %s",
                                acpi_device_bid(device)));
-               return_ACPI_STATUS(status);
+               return status;
        }
 
        *id = data->id;
@@ -103,7 +101,7 @@ acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id)
                          acpi_device_bid(device), id->segment, id->bus,
                          id->device, id->function));
 
-       return_ACPI_STATUS(AE_OK);
+       return AE_OK;
 }
 
 EXPORT_SYMBOL(acpi_get_pci_id);
@@ -120,14 +118,13 @@ int acpi_pci_bind(struct acpi_device *device)
        struct pci_dev *dev;
        struct pci_bus *bus;
 
-       ACPI_FUNCTION_TRACE("acpi_pci_bind");
 
        if (!device || !device->parent)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        pathname = kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
        if (!pathname)
-               return_VALUE(-ENOMEM);
+               return -ENOMEM;
        memset(pathname, 0, ACPI_PATHNAME_MAX);
        buffer.length = ACPI_PATHNAME_MAX;
        buffer.pointer = pathname;
@@ -135,7 +132,7 @@ int acpi_pci_bind(struct acpi_device *device)
        data = kmalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
        if (!data) {
                kfree(pathname);
-               return_VALUE(-ENOMEM);
+               return -ENOMEM;
        }
        memset(data, 0, sizeof(struct acpi_pci_data));
 
@@ -269,7 +266,7 @@ int acpi_pci_bind(struct acpi_device *device)
        if (result)
                kfree(data);
 
-       return_VALUE(result);
+       return result;
 }
 
 int acpi_pci_unbind(struct acpi_device *device)
@@ -280,14 +277,13 @@ int acpi_pci_unbind(struct acpi_device *device)
        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);
+               return -ENOMEM;
        memset(pathname, 0, ACPI_PATHNAME_MAX);
 
        buffer.length = ACPI_PATHNAME_MAX;
@@ -322,7 +318,7 @@ int acpi_pci_unbind(struct acpi_device *device)
        kfree(data);
 
       end:
-       return_VALUE(result);
+       return result;
 }
 
 int
@@ -335,11 +331,10 @@ acpi_pci_bind_root(struct acpi_device *device,
        char *pathname = NULL;
        struct acpi_buffer buffer = { 0, NULL };
 
-       ACPI_FUNCTION_TRACE("acpi_pci_bind_root");
 
        pathname = (char *)kmalloc(ACPI_PATHNAME_MAX, GFP_KERNEL);
        if (!pathname)
-               return_VALUE(-ENOMEM);
+               return -ENOMEM;
        memset(pathname, 0, ACPI_PATHNAME_MAX);
 
        buffer.length = ACPI_PATHNAME_MAX;
@@ -347,13 +342,13 @@ acpi_pci_bind_root(struct acpi_device *device,
 
        if (!device || !id || !bus) {
                kfree(pathname);
-               return_VALUE(-EINVAL);
+               return -EINVAL;
        }
 
        data = kmalloc(sizeof(struct acpi_pci_data), GFP_KERNEL);
        if (!data) {
                kfree(pathname);
-               return_VALUE(-ENOMEM);
+               return -ENOMEM;
        }
        memset(data, 0, sizeof(struct acpi_pci_data));
 
@@ -381,5 +376,5 @@ acpi_pci_bind_root(struct acpi_device *device,
        if (result != 0)
                kfree(data);
 
-       return_VALUE(result);
+       return result;
 }