[ACPI] fix return values for ACPI_FUNCTION_TRACE

http://bugzilla.kernel.org/show_bug.cgi?id=3336

Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 7333d5ffc8dfb064a0d106dacafb5e9b0d885069..e0f498c7b343c7b6fb0d7bdc6d7b94229d3b8acd 100644 (file)
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -117,11 +117,11 @@ int acpi_ac_seq_show(struct seq_file *seq, void *offset)
        ACPI_FUNCTION_TRACE("acpi_ac_seq_show");
 
        if (!ac)
-               return 0;
+               return_VALUE(0);
 
        if (acpi_ac_get_state(ac)) {
                seq_puts(seq, "ERROR: Unable to read AC Adapter state\n");
-               return 0;
+               return_VALUE(0);
        }
 
        seq_puts(seq, "state:                   ");
@@ -137,7 +137,7 @@ int acpi_ac_seq_show(struct seq_file *seq, void *offset)
                break;
        }
 
-       return 0;
+       return_VALUE(0);
 }
        
 static int acpi_ac_open_fs(struct inode *inode, struct file *file)
@@ -212,7 +212,7 @@ acpi_ac_notify (
        ACPI_FUNCTION_TRACE("acpi_ac_notify");
 
        if (!ac)
-               return;
+               return_VOID;
 
        if (acpi_bus_get_device(ac->handle, &device))
                return_VOID;

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 4c303e19ebfff70b3bcc739ecea0c95fc8919e27..7d4e52da846341d56485203bb81e4fd2a7dd54f6 100644 (file)
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -332,7 +332,7 @@ acpi_bus_receive_event (
        ACPI_FUNCTION_TRACE("acpi_bus_receive_event");
 
        if (!event)
-               return -EINVAL;
+               return_VALUE(-EINVAL);
 
        if (list_empty(&acpi_bus_event_list)) {
 
@@ -599,7 +599,7 @@ acpi_early_init (void)
        ACPI_FUNCTION_TRACE("acpi_early_init");
 
        if (acpi_disabled)
-               return;
+               return_VOID;
 
        /* enable workarounds, unless strict ACPI spec. compliance */
        if (!acpi_strict)
@@ -652,11 +652,11 @@ acpi_early_init (void)
                goto error0;
        }
 
-       return;
+       return_VOID;
 
 error0:
        disable_acpi();
-       return;
+       return_VOID;
 }
 
 static int __init
@@ -743,7 +743,7 @@ static int __init acpi_init (void)
 
        if (acpi_disabled) {
                printk(KERN_INFO PREFIX "Interpreter disabled.\n");
-               return -ENODEV;
+               return_VALUE(-ENODEV);
        }
 
        firmware_register(&acpi_subsys);

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index b632b93af76d4751f125b2f2babec81c645be7f6..31aded126ce88c2673583318cdcfbd05ad6e6762 100644 (file)
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -116,12 +116,12 @@ static int acpi_button_info_seq_show(struct seq_file *seq, void *offset)
        ACPI_FUNCTION_TRACE("acpi_button_info_seq_show");
 
        if (!button || !button->device)
-               return 0;
+               return_VALUE(0);
 
        seq_printf(seq, "type:                    %s\n", 
                acpi_device_name(button->device));
 
-       return 0;
+       return_VALUE(0);
 }
 
 static int acpi_button_info_open_fs(struct inode *inode, struct file *file)
@@ -138,7 +138,7 @@ static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)
        ACPI_FUNCTION_TRACE("acpi_button_state_seq_show");
 
        if (!button || !button->device)
-               return 0;
+               return_VALUE(0);
 
        status = acpi_evaluate_integer(button->handle,"_LID",NULL,&state);
        if (ACPI_FAILURE(status)) {
@@ -148,7 +148,7 @@ static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)
                seq_printf(seq, "state:      %s\n", (state ? "open" : "closed")); 
        }
 
-       return 0;
+       return_VALUE(0);
 }
 
 static int acpi_button_state_open_fs(struct inode *inode, struct file *file)

diff --git a/drivers/acpi/motherboard.c b/drivers/acpi/motherboard.c
index 5475a7737f70b4016a5b90ea9a8a6336c4a20909..c62f90d3b95bef52ce17a2e333b23e309a7fd6ad 100644 (file)
--- a/drivers/acpi/motherboard.c
+++ b/drivers/acpi/motherboard.c
@@ -62,7 +62,7 @@ acpi_reserve_io_ranges (struct acpi_resource *res, void *data)
                struct acpi_resource_io *io_res = &res->data.io;
 
                if (io_res->min_base_address != io_res->max_base_address)
-                       return AE_OK;
+                       return_VALUE(AE_OK);
                if (IS_RESERVED_ADDR(io_res->min_base_address, io_res->range_length)) {
                        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Motherboard resources 0x%08x - 0x%08x\n",
                                io_res->min_base_address, 
@@ -86,7 +86,7 @@ acpi_reserve_io_ranges (struct acpi_resource *res, void *data)
 
        if (requested_res)
                requested_res->flags &= ~IORESOURCE_BUSY;
-       return AE_OK;
+       return_VALUE(AE_OK);
 }
 
 static int acpi_motherboard_add (struct acpi_device *device)

diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 528d6f6ca0fb25a5c70d5a9e2ea45e82472ecaed..a44efdad2f2fa4935f52e0b730c44310e63290b2 100644 (file)
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -110,13 +110,13 @@ acpi_pci_link_check_possible (
 
        switch (resource->id) {
        case ACPI_RSTYPE_START_DPF:
-               return AE_OK;
+               return_ACPI_STATUS(AE_OK);
        case ACPI_RSTYPE_IRQ:
        {
                struct acpi_resource_irq *p = &resource->data.irq;
                if (!p || !p->number_of_interrupts) {
                        ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Blank IRQ resource\n"));
-                       return AE_OK;
+                       return_ACPI_STATUS(AE_OK);
                }
                for (i = 0; (i<p->number_of_interrupts && i<ACPI_PCI_LINK_MAX_POSSIBLE); i++) {
                        if (!p->interrupts[i]) {
@@ -137,7 +137,7 @@ acpi_pci_link_check_possible (
                if (!p || !p->number_of_interrupts) {
                        ACPI_DEBUG_PRINT((ACPI_DB_WARN, 
                                "Blank EXT IRQ resource\n"));
-                       return AE_OK;
+                       return_ACPI_STATUS(AE_OK);
                }
                for (i = 0; (i<p->number_of_interrupts && i<ACPI_PCI_LINK_MAX_POSSIBLE); i++) {
                        if (!p->interrupts[i]) {
@@ -155,10 +155,10 @@ acpi_pci_link_check_possible (
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 
                        "Resource is not an IRQ entry\n"));
-               return AE_OK;
+               return_ACPI_STATUS(AE_OK);
        }
 
-       return AE_CTRL_TERMINATE;
+       return_ACPI_STATUS(AE_CTRL_TERMINATE);
 }
 
 
@@ -207,7 +207,7 @@ acpi_pci_link_check_current (
                         */
                        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                "Blank IRQ resource\n")); 
-                       return AE_OK;
+                       return_ACPI_STATUS(AE_OK);
                }
                *irq = p->interrupts[0];
                break;
@@ -222,7 +222,7 @@ acpi_pci_link_check_current (
                         */
                        ACPI_DEBUG_PRINT((ACPI_DB_WARN,
                                "Blank EXT IRQ resource\n"));
-                       return AE_OK;
+                       return_ACPI_STATUS(AE_OK);
                }
                *irq = p->interrupts[0];
                break;
@@ -230,9 +230,9 @@ acpi_pci_link_check_current (
        default:
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                        "Resource isn't an IRQ\n"));
-               return AE_OK;
+               return_ACPI_STATUS(AE_OK);
        }
-       return AE_CTRL_TERMINATE;
+       return_ACPI_STATUS(AE_CTRL_TERMINATE);
 }
 
 /*
@@ -816,14 +816,14 @@ __setup("acpi_irq_pci=", acpi_irq_pci);
 static int __init acpi_irq_nobalance_set(char *str)
 {
        acpi_irq_balance = 0;
-       return(1);
+       return 1;
 }
 __setup("acpi_irq_nobalance", acpi_irq_nobalance_set);
 
 int __init acpi_irq_balance_set(char *str)
 {
        acpi_irq_balance = 1;
-       return(1);
+       return 1;
 }
 __setup("acpi_irq_balance", acpi_irq_balance_set);
 

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 4c3d2a7d2e961e1a8a3110fd2e26987665e7840b..419b371d95ad83ee4612f43722472b60e5f536bf 100644 (file)
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -303,7 +303,7 @@ int acpi_enable_wakeup_device_power (struct acpi_device *dev)
 
        ACPI_FUNCTION_TRACE("acpi_enable_wakeup_device_power");
        if (!dev || !dev->wakeup.flags.valid)
-               return -1;
+               return_VALUE(-1);
 
        arg.integer.value = 1;
        /* Open power resource */
@@ -313,7 +313,7 @@ int acpi_enable_wakeup_device_power (struct acpi_device *dev)
                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 
                                "Error transition power state\n"));
                        dev->wakeup.flags.valid = 0;
-                       return -1;
+                       return_VALUE(-1);
                }
        }
 
@@ -325,7 +325,7 @@ int acpi_enable_wakeup_device_power (struct acpi_device *dev)
                ret = -1;
        }
 
-       return ret;
+       return_VALUE(ret);
 }
 
 /*
@@ -344,7 +344,7 @@ int acpi_disable_wakeup_device_power (struct acpi_device *dev)
        ACPI_FUNCTION_TRACE("acpi_disable_wakeup_device_power");
 
        if (!dev || !dev->wakeup.flags.valid)
-               return -1;
+               return_VALUE(-1);
 
        arg.integer.value = 0;  
        /* Execute PSW */
@@ -352,7 +352,7 @@ int acpi_disable_wakeup_device_power (struct acpi_device *dev)
        if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluate _PSW\n"));
                dev->wakeup.flags.valid = 0;
-               return -1;
+               return_VALUE(-1);
        }
 
        /* Close power resource */
@@ -362,11 +362,11 @@ int acpi_disable_wakeup_device_power (struct acpi_device *dev)
                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 
                                "Error transition power state\n"));
                        dev->wakeup.flags.valid = 0;
-                       return -1;
+                       return_VALUE(-1);
                }
        }
 
-       return ret;
+       return_VALUE(ret);
 }
 
 /* --------------------------------------------------------------------------
@@ -513,7 +513,7 @@ static int acpi_power_seq_show(struct seq_file *seq, void *offset)
                        resource->references);
 
 end:
-       return 0;
+       return_VALUE(0);
 }
 
 static int acpi_power_open_fs(struct inode *inode, struct file *file)

diff --git a/drivers/acpi/processor.c b/drivers/acpi/processor.c
index 25114c3d8332729eefebec88e237d348d9e8d27d..20c3501e6c692f89126bcd1fc8bd28144a819ce8 100644 (file)
--- a/drivers/acpi/processor.c
+++ b/drivers/acpi/processor.c
@@ -1135,7 +1135,7 @@ static int acpi_processor_perf_seq_show(struct seq_file *seq, void *offset)
                        (u32) pr->performance->states[i].transition_latency);
 
 end:
-       return 0;
+       return_VALUE(0);
 }
 
 static int acpi_processor_perf_open_fs(struct inode *inode, struct file *file)
@@ -1860,7 +1860,7 @@ static int acpi_processor_info_seq_show(struct seq_file *seq, void *offset)
                        pr->flags.limit ? "yes" : "no");
 
 end:
-       return 0;
+       return_VALUE(0);
 }
 
 static int acpi_processor_info_open_fs(struct inode *inode, struct file *file)
@@ -1915,7 +1915,7 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
        }
 
 end:
-       return 0;
+       return_VALUE(0);
 }
 
 static int acpi_processor_power_open_fs(struct inode *inode, struct file *file)
@@ -1959,7 +1959,7 @@ static int acpi_processor_throttling_seq_show(struct seq_file *seq, void *offset
                        (pr->throttling.states[i].performance?pr->throttling.states[i].performance/10:0));
 
 end:
-       return 0;
+       return_VALUE(0);
 }
 
 static int acpi_processor_throttling_open_fs(struct inode *inode, struct file *file)
@@ -2020,7 +2020,7 @@ static int acpi_processor_limit_seq_show(struct seq_file *seq, void *offset)
                        pr->limit.thermal.px, pr->limit.thermal.tx);
 
 end:
-       return 0;
+       return_VALUE(0);
 }
 
 static int acpi_processor_limit_open_fs(struct inode *inode, struct file *file)

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 1b4ec3279c653cb921efd8d49c0947cc8919c7ea..8a0ded41130b95071d018394ac3218cb5df3767a 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -158,7 +158,7 @@ acpi_bus_get_power_flags (
 
        device->power.state = ACPI_STATE_UNKNOWN;
 
-       return 0;
+       return_VALUE(0);
 }
 
 int
@@ -278,7 +278,7 @@ acpi_bus_get_wakeup_device_flags (
 end:
        if (ACPI_FAILURE(status))
                device->flags.wake_capable = 0;
-       return 0;
+       return_VALUE(0);
 }
 
 /* --------------------------------------------------------------------------

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 221ba38803cbcef99cdc0cdd4b52097a619a5dd0..89fd3ca4fed6cfdf40c11803bdb51ef54ad50f9a 100644 (file)
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -226,7 +226,7 @@ acpi_thermal_get_temperature (
 
        status = acpi_evaluate_integer(tz->handle, "_TMP", NULL, &tz->temperature);
        if (ACPI_FAILURE(status))
-               return -ENODEV;
+               return_VALUE(-ENODEV);
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Temperature is %lu dK\n", tz->temperature));
 
@@ -328,7 +328,7 @@ acpi_thermal_get_trip_points (
        if (ACPI_FAILURE(status)) {
                tz->trips.critical.flags.valid = 0;
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "No critical threshold\n"));
-               return -ENODEV;
+               return_VALUE(-ENODEV);
        }
        else {
                tz->trips.critical.flags.valid = 1;
@@ -799,7 +799,7 @@ static int acpi_thermal_state_seq_show(struct seq_file *seq, void *offset)
        }
 
 end:
-       return 0;
+       return_VALUE(0);
 }
 
 static int acpi_thermal_state_open_fs(struct inode *inode, struct file *file)
@@ -826,7 +826,7 @@ static int acpi_thermal_temp_seq_show(struct seq_file *seq, void *offset)
                KELVIN_TO_CELSIUS(tz->temperature));
 
 end:
-       return 0;
+       return_VALUE(0);
 }
 
 static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file)
@@ -879,7 +879,7 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
        }
 
 end:
-       return 0;
+       return_VALUE(0);
 }
 
 static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file)
@@ -958,7 +958,7 @@ static int acpi_thermal_cooling_seq_show(struct seq_file *seq, void *offset)
                        tz->cooling_mode?"passive":"active");
 
 end:
-       return 0;
+       return_VALUE(0);
 }
 
 static int acpi_thermal_cooling_open_fs(struct inode *inode, struct file *file)
@@ -1021,7 +1021,7 @@ static int acpi_thermal_polling_seq_show(struct seq_file *seq, void *offset)
                (tz->polling_frequency / 10));
 
 end:
-       return 0;
+       return_VALUE(0);
 }
 
 static int acpi_thermal_polling_open_fs(struct inode *inode, struct file *file)

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index ed66215b32ab85110c7f8a5ea886abe0a4dca3f3..397d082a6bd64ef948941a7960ee5e7378f5f1d2 100644 (file)
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -373,7 +373,7 @@ acpi_evaluate_reference (
        }
 
        if (package->package.count > ACPI_MAX_HANDLES) {
-               return AE_NO_MEMORY;
+               return_ACPI_STATUS(AE_NO_MEMORY);
        }
        list->count = package->package.count;
 

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 7c0f6a52eebc27643e7a2f49dbe6569f44b2e8c4..d83460c343da44671c2b0d37537cd5a154131b2a 100644 (file)
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1670,7 +1670,7 @@ acpi_video_bus_put_one_device(
        ACPI_FUNCTION_TRACE("acpi_video_bus_put_one_device");
 
        if (!device || !device->video)
-               return (-ENOENT);
+               return_VALUE(-ENOENT);
 
        video = device->video;