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

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

1 files changed, 36 insertions, 58 deletions

diff --git a/drivers/acpi/hotkey.c b/drivers/acpi/hotkey.c
index 393dbbca4e85..fd81a0f5222f 100644
--- a/drivers/acpi/hotkey.c
+++ b/drivers/acpi/hotkey.c
@@ -231,11 +231,10 @@ struct list_head hotkey_entries;	/* head of the list of hotkey_list */
 
 static int hotkey_info_seq_show(struct seq_file *seq, void *offset)
 {
-        ACPI_FUNCTION_TRACE("hotkey_info_seq_show");
 
         seq_printf(seq, "Hotkey generic driver ver: %s\n", HOTKEY_ACPI_VERSION);
 
-        return_VALUE(0);
+        return 0;
 }
 
 static int hotkey_info_open_fs(struct inode *inode, struct file *file)
@@ -266,7 +265,6 @@ static int hotkey_polling_seq_show(struct seq_file *seq, void *offset)
             (struct acpi_polling_hotkey *)seq->private;
         char *buf;
 
-        ACPI_FUNCTION_TRACE("hotkey_polling_seq_show");
 
         if (poll_hotkey->poll_result) {
                 buf = format_result(poll_hotkey->poll_result);
@@ -274,7 +272,7 @@ static int hotkey_polling_seq_show(struct seq_file *seq, void *offset)
                         seq_printf(seq, "%s", buf);
                 kfree(buf);
         }
-        return_VALUE(0);
+        return 0;
 }
 
 static int hotkey_polling_open_fs(struct inode *inode, struct file *file)
@@ -293,7 +291,6 @@ static int hotkey_get_internal_event(int event, struct acpi_hotkey_list *list)
         struct list_head *entries;
         int val = -1;
 
-        ACPI_FUNCTION_TRACE("hotkey_get_internal_event");
 
         list_for_each(entries, list->entries) {
                 union acpi_hotkey *key =
@@ -305,7 +302,7 @@ static int hotkey_get_internal_event(int event, struct acpi_hotkey_list *list)
                 }
         }
 
-        return_VALUE(val);
+        return val;
 }
 
 static void
@@ -314,15 +311,14 @@ acpi_hotkey_notify_handler(acpi_handle handle, u32 event, void *data)
         struct acpi_device *device = NULL;
         u32 internal_event;
 
-        ACPI_FUNCTION_TRACE("acpi_hotkey_notify_handler");
 
         if (acpi_bus_get_device(handle, &device))
-                return_VOID;
+                return;
 
         internal_event = hotkey_get_internal_event(event, &global_hotkey_list);
         acpi_bus_generate_event(device, internal_event, 0);
 
-        return_VOID;
+        return;
 }
 
 /* Need to invent automatically hotkey add method */
@@ -346,7 +342,6 @@ static int create_polling_proc(union acpi_hotkey *device)
         char proc_name[80];
         mode_t mode;
 
-        ACPI_FUNCTION_TRACE("create_polling_proc");
         mode = S_IFREG | S_IRUGO | S_IWUGO;
 
         sprintf(proc_name, "%d", device->link.hotkey_standard_num);
@@ -356,7 +351,7 @@ static int create_polling_proc(union acpi_hotkey *device)
         proc = create_proc_entry(proc_name, mode, hotkey_proc_dir);
 
         if (!proc) {
-                return_VALUE(-ENODEV);
+                return -ENODEV;
         } else {
                 proc->proc_fops = &hotkey_polling_fops;
                 proc->owner = THIS_MODULE;
@@ -365,7 +360,7 @@ static int create_polling_proc(union acpi_hotkey *device)
                 proc->gid = 0;
                 device->poll_hotkey.proc = proc;
         }
-        return_VALUE(0);
+        return 0;
 }
 
 static int hotkey_add(union acpi_hotkey *device)
@@ -373,7 +368,6 @@ static int hotkey_add(union acpi_hotkey *device)
         int status = 0;
         struct acpi_device *dev = NULL;
 
-        ACPI_FUNCTION_TRACE("hotkey_add");
 
         if (device->link.hotkey_type == ACPI_HOTKEY_EVENT) {
                 acpi_bus_get_device(device->event_hotkey.bus_handle, &dev);
@@ -388,14 +382,13 @@ static int hotkey_add(union acpi_hotkey *device)
 
         list_add_tail(&device->link.entries, global_hotkey_list.entries);
 
-        return_VALUE(status);
+        return status;
 }
 
 static int hotkey_remove(union acpi_hotkey *device)
 {
         struct list_head *entries, *next;
 
-        ACPI_FUNCTION_TRACE("hotkey_remove");
 
         list_for_each_safe(entries, next, global_hotkey_list.entries) {
                 union acpi_hotkey *key =
@@ -409,14 +402,13 @@ static int hotkey_remove(union acpi_hotkey *device)
                 }
         }
         kfree(device);
-        return_VALUE(0);
+        return 0;
 }
 
 static int hotkey_update(union acpi_hotkey *key)
 {
         struct list_head *entries;
 
-        ACPI_FUNCTION_TRACE("hotkey_update");
 
         list_for_each(entries, global_hotkey_list.entries) {
                 union acpi_hotkey *tmp =
@@ -458,19 +450,18 @@ static int hotkey_update(union acpi_hotkey *key)
                                  */
                                 kfree(key);
                         }
-                        return_VALUE(0);
+                        return 0;
                         break;
                 }
         }
 
-        return_VALUE(-ENODEV);
+        return -ENODEV;
 }
 
 static void free_hotkey_device(union acpi_hotkey *key)
 {
         struct acpi_device *dev;
 
-        ACPI_FUNCTION_TRACE("free_hotkey_device");
 
         if (key->link.hotkey_type == ACPI_HOTKEY_EVENT) {
                 acpi_bus_get_device(key->event_hotkey.bus_handle, &dev);
@@ -490,7 +481,7 @@ static void free_hotkey_device(union acpi_hotkey *key)
                 free_poll_hotkey_buffer(key);
         }
         kfree(key);
-        return_VOID;
+        return;
 }
 
 static void free_hotkey_buffer(union acpi_hotkey *key)
@@ -511,7 +502,6 @@ init_hotkey_device(union acpi_hotkey *key, char *bus_str, char *action_str,
         acpi_handle tmp_handle;
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_TRACE("init_hotkey_device");
 
         if (std_num < 0 || IS_POLL(std_num) || !key)
                 goto do_fail;
@@ -538,9 +528,9 @@ init_hotkey_device(union acpi_hotkey *key, char *bus_str, char *action_str,
                                  method, &tmp_handle);
         if (ACPI_FAILURE(status))
                 goto do_fail;
-        return_VALUE(AE_OK);
+        return AE_OK;
       do_fail:
-        return_VALUE(-ENODEV);
+        return -ENODEV;
 }
 
 static int
@@ -552,7 +542,6 @@ init_poll_hotkey_device(union acpi_hotkey *key,
         acpi_status status = AE_OK;
         acpi_handle tmp_handle;
 
-        ACPI_FUNCTION_TRACE("init_poll_hotkey_device");
 
         if (std_num < 0 || IS_EVENT(std_num) || !key)
                 goto do_fail;
@@ -587,22 +576,20 @@ init_poll_hotkey_device(union acpi_hotkey *key,
             (union acpi_object *)kmalloc(sizeof(union acpi_object), GFP_KERNEL);
         if (!key->poll_hotkey.poll_result)
                 goto do_fail;
-        return_VALUE(AE_OK);
+        return AE_OK;
       do_fail:
-        return_VALUE(-ENODEV);
+        return -ENODEV;
 }
 
 static int hotkey_open_config(struct inode *inode, struct file *file)
 {
-        ACPI_FUNCTION_TRACE("hotkey_open_config");
-        return_VALUE(single_open
+        return (single_open
                      (file, hotkey_config_seq_show, PDE(inode)->data));
 }
 
 static int hotkey_poll_open_config(struct inode *inode, struct file *file)
 {
-        ACPI_FUNCTION_TRACE("hotkey_poll_open_config");
-        return_VALUE(single_open
+        return (single_open
                      (file, hotkey_poll_config_seq_show, PDE(inode)->data));
 }
 
@@ -615,7 +602,6 @@ static int hotkey_config_seq_show(struct seq_file *seq, void *offset)
         struct acpi_buffer bus = { ACPI_PATHNAME_MAX, bus_name };
         struct acpi_buffer act = { ACPI_PATHNAME_MAX, action_name };
 
-        ACPI_FUNCTION_TRACE(("hotkey_config_seq_show"));
 
         list_for_each(entries, hotkey_list->entries) {
                 union acpi_hotkey *key =
@@ -633,7 +619,7 @@ static int hotkey_config_seq_show(struct seq_file *seq, void *offset)
                 }
         }
         seq_puts(seq, "\n");
-        return_VALUE(0);
+        return 0;
 }
 
 static int hotkey_poll_config_seq_show(struct seq_file *seq, void *offset)
@@ -645,7 +631,6 @@ static int hotkey_poll_config_seq_show(struct seq_file *seq, void *offset)
         struct acpi_buffer bus = { ACPI_PATHNAME_MAX, bus_name };
         struct acpi_buffer act = { ACPI_PATHNAME_MAX, action_name };
 
-        ACPI_FUNCTION_TRACE(("hotkey_config_seq_show"));
 
         list_for_each(entries, hotkey_list->entries) {
                 union acpi_hotkey *key =
@@ -663,7 +648,7 @@ static int hotkey_poll_config_seq_show(struct seq_file *seq, void *offset)
                 }
         }
         seq_puts(seq, "\n");
-        return_VALUE(0);
+        return 0;
 }
 
 static int
@@ -675,7 +660,6 @@ get_parms(char *config_record,
           char **method, int *internal_event_num, int *external_event_num)
 {
         char *tmp, *tmp1, count;
-        ACPI_FUNCTION_TRACE(("get_parms"));
 
         sscanf(config_record, "%d", cmd);
 
@@ -741,9 +725,9 @@ get_parms(char *config_record,
             0)
                 goto do_fail;
 
-        return_VALUE(6);
+        return 6;
       do_fail:
-        return_VALUE(-1);
+        return -1;
 }
 
 /*  count is length for one input record */
@@ -760,16 +744,15 @@ static ssize_t hotkey_write_config(struct file *file,
         int ret = 0;
         union acpi_hotkey *key = NULL;
 
-        ACPI_FUNCTION_TRACE(("hotkey_write_config"));
 
         config_record = (char *)kmalloc(count + 1, GFP_KERNEL);
         if (!config_record)
-                return_VALUE(-ENOMEM);
+                return -ENOMEM;
 
         if (copy_from_user(config_record, buffer, count)) {
                 kfree(config_record);
                 printk(KERN_ERR PREFIX "Invalid data\n");
-                return_VALUE(-EINVAL);
+                return -EINVAL;
         }
         config_record[count] = 0;
 
@@ -790,7 +773,7 @@ static ssize_t hotkey_write_config(struct file *file,
                 kfree(action_handle);
                 kfree(method);
                 printk(KERN_ERR PREFIX "Invalid data format ret=%d\n", ret);
-                return_VALUE(-EINVAL);
+                return -EINVAL;
         }
 
         key = kmalloc(sizeof(union acpi_hotkey), GFP_KERNEL);
@@ -825,7 +808,7 @@ static ssize_t hotkey_write_config(struct file *file,
                         free_poll_hotkey_buffer(key);
                 kfree(key);
                 printk(KERN_ERR PREFIX "Invalid hotkey\n");
-                return_VALUE(-EINVAL);
+                return -EINVAL;
         }
 
       cont_cmd:
@@ -851,7 +834,7 @@ static ssize_t hotkey_write_config(struct file *file,
                 goto fail_out;
                 break;
         }
-        return_VALUE(count);
+        return count;
       fail_out:
         if (IS_EVENT(internal_event_num))
                 free_hotkey_buffer(key);
@@ -859,7 +842,7 @@ static ssize_t hotkey_write_config(struct file *file,
                 free_poll_hotkey_buffer(key);
         kfree(key);
         printk(KERN_ERR PREFIX "invalid key\n");
-        return_VALUE(-EINVAL);
+        return -EINVAL;
 }
 
 /*
@@ -876,7 +859,6 @@ static int write_acpi_int(acpi_handle handle, const char *method, int val,
         union acpi_object in_obj;       /* the only param we use */
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("write_acpi_int");
         params.count = 1;
         params.pointer = &in_obj;
         in_obj.type = ACPI_TYPE_INTEGER;
@@ -884,7 +866,7 @@ static int write_acpi_int(acpi_handle handle, const char *method, int val,
 
         status = acpi_evaluate_object(handle, (char *)method, &params, output);
 
-        return_VALUE(status == AE_OK);
+        return (status == AE_OK);
 }
 
 static int read_acpi_int(acpi_handle handle, const char *method,
@@ -894,7 +876,6 @@ static int read_acpi_int(acpi_handle handle, const char *method,
         union acpi_object out_obj;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("read_acpi_int");
         output.length = sizeof(out_obj);
         output.pointer = &out_obj;
 
@@ -904,7 +885,7 @@ static int read_acpi_int(acpi_handle handle, const char *method,
                 val->type = out_obj.type;
         } else
                 printk(KERN_ERR PREFIX "null val pointer\n");
-        return_VALUE((status == AE_OK)
+        return ((status == AE_OK)
                      && (out_obj.type == ACPI_TYPE_INTEGER));
 }
 
@@ -941,24 +922,23 @@ static ssize_t hotkey_execute_aml_method(struct file *file,
         int event, method_type, type, value;
         union acpi_hotkey *key;
 
-        ACPI_FUNCTION_TRACE("hotkey_execte_aml_method");
 
         arg = (char *)kmalloc(count + 1, GFP_KERNEL);
         if (!arg)
-                return_VALUE(-ENOMEM);
+                return -ENOMEM;
         arg[count] = 0;
 
         if (copy_from_user(arg, buffer, count)) {
                 kfree(arg);
                 printk(KERN_ERR PREFIX "Invalid argument 2\n");
-                return_VALUE(-EINVAL);
+                return -EINVAL;
         }
 
         if (sscanf(arg, "%d:%d:%d:%d", &event, &method_type, &type, &value) !=
             4) {
                 kfree(arg);
                 printk(KERN_ERR PREFIX "Invalid argument 3\n");
-                return_VALUE(-EINVAL);
+                return -EINVAL;
         }
         kfree(arg);
         if (type == ACPI_TYPE_INTEGER) {
@@ -984,11 +964,11 @@ static ssize_t hotkey_execute_aml_method(struct file *file,
                 }
         } else {
                 printk(KERN_WARNING "Not supported\n");
-                return_VALUE(-EINVAL);
+                return -EINVAL;
         }
-        return_VALUE(count);
+        return count;
       do_fail:
-        return_VALUE(-EINVAL);
+        return -EINVAL;
 
 }
 
@@ -997,7 +977,6 @@ static int __init hotkey_init(void)
         int result;
         mode_t mode = S_IFREG | S_IRUGO | S_IWUGO;
 
-        ACPI_FUNCTION_TRACE("hotkey_init");
 
         if (acpi_disabled)
                 return -ENODEV;
@@ -1084,7 +1063,6 @@ static void __exit hotkey_exit(void)
 {
         struct list_head *entries, *next;
 
-        ACPI_FUNCTION_TRACE("hotkey_exit");
 
         list_for_each_safe(entries, next, global_hotkey_list.entries) {
                 union acpi_hotkey *key =