]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/acpi/thermal.c
ACPI: delete tracing macros from drivers/acpi/*.c
[karo-tx-linux.git] / drivers / acpi / thermal.c
index 1b9754919f726d6fa0deccf2ae77ace0e2fa5004..c855f4446b5fc45263166051829166e7f1b1a0c4 100644 (file)
@@ -222,51 +222,48 @@ static int acpi_thermal_get_temperature(struct acpi_thermal *tz)
 {
        acpi_status status = AE_OK;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_get_temperature");
 
        if (!tz)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        tz->last_temperature = tz->temperature;
 
        status =
            acpi_evaluate_integer(tz->handle, "_TMP", NULL, &tz->temperature);
        if (ACPI_FAILURE(status))
-               return_VALUE(-ENODEV);
+               return -ENODEV;
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Temperature is %lu dK\n",
                          tz->temperature));
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_get_polling_frequency(struct acpi_thermal *tz)
 {
        acpi_status status = AE_OK;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_get_polling_frequency");
 
        if (!tz)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        status =
            acpi_evaluate_integer(tz->handle, "_TZP", NULL,
                                  &tz->polling_frequency);
        if (ACPI_FAILURE(status))
-               return_VALUE(-ENODEV);
+               return -ENODEV;
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Polling frequency is %lu dS\n",
                          tz->polling_frequency));
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_set_polling(struct acpi_thermal *tz, int seconds)
 {
-       ACPI_FUNCTION_TRACE("acpi_thermal_set_polling");
 
        if (!tz)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        tz->polling_frequency = seconds * 10;   /* Convert value to deci-seconds */
 
@@ -274,7 +271,7 @@ static int acpi_thermal_set_polling(struct acpi_thermal *tz, int seconds)
                          "Polling frequency set to %lu seconds\n",
                          tz->polling_frequency));
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_set_cooling_mode(struct acpi_thermal *tz, int mode)
@@ -284,29 +281,28 @@ static int acpi_thermal_set_cooling_mode(struct acpi_thermal *tz, int mode)
        struct acpi_object_list arg_list = { 1, &arg0 };
        acpi_handle handle = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_set_cooling_mode");
 
        if (!tz)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        status = acpi_get_handle(tz->handle, "_SCP", &handle);
        if (ACPI_FAILURE(status)) {
                ACPI_DEBUG_PRINT((ACPI_DB_INFO, "_SCP not present\n"));
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        }
 
        arg0.integer.value = mode;
 
        status = acpi_evaluate_object(handle, NULL, &arg_list, NULL);
        if (ACPI_FAILURE(status))
-               return_VALUE(-ENODEV);
+               return -ENODEV;
 
        tz->cooling_mode = mode;
 
        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Cooling mode [%s]\n",
                          mode ? "passive" : "active"));
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
@@ -314,10 +310,9 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
        acpi_status status = AE_OK;
        int i = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_get_trip_points");
 
        if (!tz)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        /* Critical Shutdown (required) */
 
@@ -326,7 +321,7 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
        if (ACPI_FAILURE(status)) {
                tz->trips.critical.flags.valid = 0;
                ACPI_EXCEPTION((AE_INFO, status, "No critical threshold"));
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        } else {
                tz->trips.critical.flags.valid = 1;
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -417,24 +412,23 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
                                        "Invalid active threshold [%d]", i));
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_get_devices(struct acpi_thermal *tz)
 {
        acpi_status status = AE_OK;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_get_devices");
 
        if (!tz)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        status =
            acpi_evaluate_reference(tz->handle, "_TZD", NULL, &tz->devices);
        if (ACPI_FAILURE(status))
-               return_VALUE(-ENODEV);
+               return -ENODEV;
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_call_usermode(char *path)
@@ -442,10 +436,9 @@ static int acpi_thermal_call_usermode(char *path)
        char *argv[2] = { NULL, NULL };
        char *envp[3] = { NULL, NULL, NULL };
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_call_usermode");
 
        if (!path)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        argv[0] = path;
 
@@ -455,7 +448,7 @@ static int acpi_thermal_call_usermode(char *path)
 
        call_usermodehelper(argv[0], argv, envp, 0);
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_critical(struct acpi_thermal *tz)
@@ -463,10 +456,9 @@ static int acpi_thermal_critical(struct acpi_thermal *tz)
        int result = 0;
        struct acpi_device *device = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_critical");
 
        if (!tz || !tz->trips.critical.flags.valid)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        if (tz->temperature >= tz->trips.critical.temperature) {
                printk(KERN_WARNING PREFIX "Critical trip point\n");
@@ -476,7 +468,7 @@ static int acpi_thermal_critical(struct acpi_thermal *tz)
 
        result = acpi_bus_get_device(tz->handle, &device);
        if (result)
-               return_VALUE(result);
+               return result;
 
        printk(KERN_EMERG
               "Critical temperature reached (%ld C), shutting down.\n",
@@ -486,7 +478,7 @@ static int acpi_thermal_critical(struct acpi_thermal *tz)
 
        acpi_thermal_call_usermode(ACPI_THERMAL_PATH_POWEROFF);
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_hot(struct acpi_thermal *tz)
@@ -494,10 +486,9 @@ static int acpi_thermal_hot(struct acpi_thermal *tz)
        int result = 0;
        struct acpi_device *device = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_hot");
 
        if (!tz || !tz->trips.hot.flags.valid)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        if (tz->temperature >= tz->trips.hot.temperature) {
                printk(KERN_WARNING PREFIX "Hot trip point\n");
@@ -507,14 +498,14 @@ static int acpi_thermal_hot(struct acpi_thermal *tz)
 
        result = acpi_bus_get_device(tz->handle, &device);
        if (result)
-               return_VALUE(result);
+               return result;
 
        acpi_bus_generate_event(device, ACPI_THERMAL_NOTIFY_HOT,
                                tz->trips.hot.flags.enabled);
 
        /* TBD: Call user-mode "sleep(S4)" function */
 
-       return_VALUE(0);
+       return 0;
 }
 
 static void acpi_thermal_passive(struct acpi_thermal *tz)
@@ -524,7 +515,6 @@ static void acpi_thermal_passive(struct acpi_thermal *tz)
        int trend = 0;
        int i = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_passive");
 
        if (!tz || !tz->trips.passive.flags.valid)
                return;
@@ -613,7 +603,6 @@ static void acpi_thermal_active(struct acpi_thermal *tz)
        int j = 0;
        unsigned long maxtemp = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_active");
 
        if (!tz)
                return;
@@ -695,18 +684,17 @@ static void acpi_thermal_check(void *data)
        int i = 0;
        struct acpi_thermal_state state;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_check");
 
        if (!tz) {
                printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
-               return_VOID;
+               return;
        }
 
        state = tz->state;
 
        result = acpi_thermal_get_temperature(tz);
        if (result)
-               return_VOID;
+               return;
 
        memset(&tz->state, 0, sizeof(tz->state));
 
@@ -795,7 +783,7 @@ static void acpi_thermal_check(void *data)
                }
        }
 
-       return_VOID;
+       return;
 }
 
 /* --------------------------------------------------------------------------
@@ -808,7 +796,6 @@ static int acpi_thermal_state_seq_show(struct seq_file *seq, void *offset)
 {
        struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_state_seq_show");
 
        if (!tz)
                goto end;
@@ -831,7 +818,7 @@ static int acpi_thermal_state_seq_show(struct seq_file *seq, void *offset)
        }
 
       end:
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_state_open_fs(struct inode *inode, struct file *file)
@@ -844,7 +831,6 @@ static int acpi_thermal_temp_seq_show(struct seq_file *seq, void *offset)
        int result = 0;
        struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_temp_seq_show");
 
        if (!tz)
                goto end;
@@ -857,7 +843,7 @@ static int acpi_thermal_temp_seq_show(struct seq_file *seq, void *offset)
                   KELVIN_TO_CELSIUS(tz->temperature));
 
       end:
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file)
@@ -871,7 +857,6 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
        int i = 0;
        int j = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_trip_seq_show");
 
        if (!tz)
                goto end;
@@ -911,7 +896,7 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
        }
 
       end:
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_trip_open_fs(struct inode *inode, struct file *file)
@@ -932,18 +917,17 @@ acpi_thermal_write_trip_points(struct file *file,
        int *active;
        int i = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_write_trip_points");
 
        limit_string = kmalloc(ACPI_THERMAL_MAX_LIMIT_STR_LEN, GFP_KERNEL);
        if (!limit_string)
-               return_VALUE(-ENOMEM);
+               return -ENOMEM;
 
        memset(limit_string, 0, ACPI_THERMAL_MAX_LIMIT_STR_LEN);
 
        active = kmalloc(ACPI_THERMAL_MAX_ACTIVE * sizeof(int), GFP_KERNEL);
        if (!active) {
                kfree(limit_string);
-               return_VALUE(-ENOMEM);
+               return -ENOMEM;
        }
 
        if (!tz || (count > ACPI_THERMAL_MAX_LIMIT_STR_LEN - 1)) {
@@ -980,14 +964,13 @@ acpi_thermal_write_trip_points(struct file *file,
       end:
        kfree(active);
        kfree(limit_string);
-       return_VALUE(count);
+       return count;
 }
 
 static int acpi_thermal_cooling_seq_show(struct seq_file *seq, void *offset)
 {
        struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_cooling_seq_show");
 
        if (!tz)
                goto end;
@@ -1003,7 +986,7 @@ static int acpi_thermal_cooling_seq_show(struct seq_file *seq, void *offset)
                           tz->cooling_mode ? "passive" : "active");
 
       end:
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_cooling_open_fs(struct inode *inode, struct file *file)
@@ -1022,16 +1005,15 @@ acpi_thermal_write_cooling_mode(struct file *file,
        int result = 0;
        char mode_string[12] = { '\0' };
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_write_cooling_mode");
 
        if (!tz || (count > sizeof(mode_string) - 1))
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        if (!tz->flags.cooling_mode)
-               return_VALUE(-ENODEV);
+               return -ENODEV;
 
        if (copy_from_user(mode_string, buffer, count))
-               return_VALUE(-EFAULT);
+               return -EFAULT;
 
        mode_string[count] = '\0';
 
@@ -1039,18 +1021,17 @@ acpi_thermal_write_cooling_mode(struct file *file,
                                               simple_strtoul(mode_string, NULL,
                                                              0));
        if (result)
-               return_VALUE(result);
+               return result;
 
        acpi_thermal_check(tz);
 
-       return_VALUE(count);
+       return count;
 }
 
 static int acpi_thermal_polling_seq_show(struct seq_file *seq, void *offset)
 {
        struct acpi_thermal *tz = (struct acpi_thermal *)seq->private;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_polling_seq_show");
 
        if (!tz)
                goto end;
@@ -1064,7 +1045,7 @@ static int acpi_thermal_polling_seq_show(struct seq_file *seq, void *offset)
                   (tz->polling_frequency / 10));
 
       end:
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_polling_open_fs(struct inode *inode, struct file *file)
@@ -1084,13 +1065,12 @@ acpi_thermal_write_polling(struct file *file,
        char polling_string[12] = { '\0' };
        int seconds = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_write_polling");
 
        if (!tz || (count > sizeof(polling_string) - 1))
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        if (copy_from_user(polling_string, buffer, count))
-               return_VALUE(-EFAULT);
+               return -EFAULT;
 
        polling_string[count] = '\0';
 
@@ -1098,24 +1078,23 @@ acpi_thermal_write_polling(struct file *file,
 
        result = acpi_thermal_set_polling(tz, seconds);
        if (result)
-               return_VALUE(result);
+               return result;
 
        acpi_thermal_check(tz);
 
-       return_VALUE(count);
+       return count;
 }
 
 static int acpi_thermal_add_fs(struct acpi_device *device)
 {
        struct proc_dir_entry *entry = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_add_fs");
 
        if (!acpi_device_dir(device)) {
                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
                                                     acpi_thermal_dir);
                if (!acpi_device_dir(device))
-                       return_VALUE(-ENODEV);
+                       return -ENODEV;
                acpi_device_dir(device)->owner = THIS_MODULE;
        }
 
@@ -1123,7 +1102,7 @@ static int acpi_thermal_add_fs(struct acpi_device *device)
        entry = create_proc_entry(ACPI_THERMAL_FILE_STATE,
                                  S_IRUGO, acpi_device_dir(device));
        if (!entry)
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        else {
                entry->proc_fops = &acpi_thermal_state_fops;
                entry->data = acpi_driver_data(device);
@@ -1134,7 +1113,7 @@ static int acpi_thermal_add_fs(struct acpi_device *device)
        entry = create_proc_entry(ACPI_THERMAL_FILE_TEMPERATURE,
                                  S_IRUGO, acpi_device_dir(device));
        if (!entry)
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        else {
                entry->proc_fops = &acpi_thermal_temp_fops;
                entry->data = acpi_driver_data(device);
@@ -1146,7 +1125,7 @@ static int acpi_thermal_add_fs(struct acpi_device *device)
                                  S_IFREG | S_IRUGO | S_IWUSR,
                                  acpi_device_dir(device));
        if (!entry)
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        else {
                entry->proc_fops = &acpi_thermal_trip_fops;
                entry->data = acpi_driver_data(device);
@@ -1158,7 +1137,7 @@ static int acpi_thermal_add_fs(struct acpi_device *device)
                                  S_IFREG | S_IRUGO | S_IWUSR,
                                  acpi_device_dir(device));
        if (!entry)
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        else {
                entry->proc_fops = &acpi_thermal_cooling_fops;
                entry->data = acpi_driver_data(device);
@@ -1170,19 +1149,18 @@ static int acpi_thermal_add_fs(struct acpi_device *device)
                                  S_IFREG | S_IRUGO | S_IWUSR,
                                  acpi_device_dir(device));
        if (!entry)
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        else {
                entry->proc_fops = &acpi_thermal_polling_fops;
                entry->data = acpi_driver_data(device);
                entry->owner = THIS_MODULE;
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_remove_fs(struct acpi_device *device)
 {
-       ACPI_FUNCTION_TRACE("acpi_thermal_remove_fs");
 
        if (acpi_device_dir(device)) {
                remove_proc_entry(ACPI_THERMAL_FILE_POLLING_FREQ,
@@ -1199,7 +1177,7 @@ static int acpi_thermal_remove_fs(struct acpi_device *device)
                acpi_device_dir(device) = NULL;
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
 /* --------------------------------------------------------------------------
@@ -1211,13 +1189,12 @@ static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)
        struct acpi_thermal *tz = (struct acpi_thermal *)data;
        struct acpi_device *device = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_notify");
 
        if (!tz)
-               return_VOID;
+               return;
 
        if (acpi_bus_get_device(tz->handle, &device))
-               return_VOID;
+               return;
 
        switch (event) {
        case ACPI_THERMAL_NOTIFY_TEMPERATURE:
@@ -1239,27 +1216,26 @@ static void acpi_thermal_notify(acpi_handle handle, u32 event, void *data)
                break;
        }
 
-       return_VOID;
+       return;
 }
 
 static int acpi_thermal_get_info(struct acpi_thermal *tz)
 {
        int result = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_get_info");
 
        if (!tz)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        /* Get temperature [_TMP] (required) */
        result = acpi_thermal_get_temperature(tz);
        if (result)
-               return_VALUE(result);
+               return result;
 
        /* Get trip points [_CRT, _PSV, etc.] (required) */
        result = acpi_thermal_get_trip_points(tz);
        if (result)
-               return_VALUE(result);
+               return result;
 
        /* Set the cooling mode [_SCP] to active cooling (default) */
        result = acpi_thermal_set_cooling_mode(tz, ACPI_THERMAL_MODE_ACTIVE);
@@ -1299,7 +1275,7 @@ static int acpi_thermal_get_info(struct acpi_thermal *tz)
        if (!result)
                tz->flags.devices = 1;
 
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_add(struct acpi_device *device)
@@ -1308,14 +1284,13 @@ static int acpi_thermal_add(struct acpi_device *device)
        acpi_status status = AE_OK;
        struct acpi_thermal *tz = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_add");
 
        if (!device)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        tz = kmalloc(sizeof(struct acpi_thermal), GFP_KERNEL);
        if (!tz)
-               return_VALUE(-ENOMEM);
+               return -ENOMEM;
        memset(tz, 0, sizeof(struct acpi_thermal));
 
        tz->handle = device->handle;
@@ -1354,7 +1329,7 @@ static int acpi_thermal_add(struct acpi_device *device)
                kfree(tz);
        }
 
-       return_VALUE(result);
+       return result;
 }
 
 static int acpi_thermal_remove(struct acpi_device *device, int type)
@@ -1362,10 +1337,9 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)
        acpi_status status = AE_OK;
        struct acpi_thermal *tz = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_remove");
 
        if (!device || !acpi_driver_data(device))
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        tz = (struct acpi_thermal *)acpi_driver_data(device);
 
@@ -1396,7 +1370,7 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)
        acpi_thermal_remove_fs(device);
 
        kfree(tz);
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_thermal_resume(struct acpi_device *device, int state)
@@ -1404,7 +1378,7 @@ static int acpi_thermal_resume(struct acpi_device *device, int state)
        struct acpi_thermal *tz = NULL;
 
        if (!device || !acpi_driver_data(device))
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        tz = (struct acpi_thermal *)acpi_driver_data(device);
 
@@ -1417,31 +1391,29 @@ static int __init acpi_thermal_init(void)
 {
        int result = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_thermal_init");
 
        acpi_thermal_dir = proc_mkdir(ACPI_THERMAL_CLASS, acpi_root_dir);
        if (!acpi_thermal_dir)
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        acpi_thermal_dir->owner = THIS_MODULE;
 
        result = acpi_bus_register_driver(&acpi_thermal_driver);
        if (result < 0) {
                remove_proc_entry(ACPI_THERMAL_CLASS, acpi_root_dir);
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
 static void __exit acpi_thermal_exit(void)
 {
-       ACPI_FUNCTION_TRACE("acpi_thermal_exit");
 
        acpi_bus_unregister_driver(&acpi_thermal_driver);
 
        remove_proc_entry(ACPI_THERMAL_CLASS, acpi_root_dir);
 
-       return_VOID;
+       return;
 }
 
 module_init(acpi_thermal_init);