diff options
author | Patrick Mochel <mochel@linux.intel.com> | 2006-06-27 00:41:40 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-27 00:41:40 -0400 |
commit | d550d98d3317378d93a4869db204725d270ec812 (patch) | |
tree | 958a8578babc6f9955f91e21253d1d1b847985ff /drivers/acpi/event.c | |
parent | d7fa2589bbe7ab53fd5eb20e8c7e388d5aff6f16 (diff) |
ACPI: delete tracing macros from drivers/acpi/*.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/event.c')
-rw-r--r-- | drivers/acpi/event.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c index dab09d3f6307..a901b23e95e7 100644 --- a/drivers/acpi/event.c +++ b/drivers/acpi/event.c | |||
@@ -48,18 +48,17 @@ acpi_system_read_event(struct file *file, char __user * buffer, size_t count, | |||
48 | static int chars_remaining = 0; | 48 | static int chars_remaining = 0; |
49 | static char *ptr; | 49 | static char *ptr; |
50 | 50 | ||
51 | ACPI_FUNCTION_TRACE("acpi_system_read_event"); | ||
52 | 51 | ||
53 | if (!chars_remaining) { | 52 | if (!chars_remaining) { |
54 | memset(&event, 0, sizeof(struct acpi_bus_event)); | 53 | memset(&event, 0, sizeof(struct acpi_bus_event)); |
55 | 54 | ||
56 | if ((file->f_flags & O_NONBLOCK) | 55 | if ((file->f_flags & O_NONBLOCK) |
57 | && (list_empty(&acpi_bus_event_list))) | 56 | && (list_empty(&acpi_bus_event_list))) |
58 | return_VALUE(-EAGAIN); | 57 | return -EAGAIN; |
59 | 58 | ||
60 | result = acpi_bus_receive_event(&event); | 59 | result = acpi_bus_receive_event(&event); |
61 | if (result) | 60 | if (result) |
62 | return_VALUE(result); | 61 | return result; |
63 | 62 | ||
64 | chars_remaining = sprintf(str, "%s %s %08x %08x\n", | 63 | chars_remaining = sprintf(str, "%s %s %08x %08x\n", |
65 | event.device_class ? event. | 64 | event.device_class ? event. |
@@ -75,13 +74,13 @@ acpi_system_read_event(struct file *file, char __user * buffer, size_t count, | |||
75 | } | 74 | } |
76 | 75 | ||
77 | if (copy_to_user(buffer, ptr, count)) | 76 | if (copy_to_user(buffer, ptr, count)) |
78 | return_VALUE(-EFAULT); | 77 | return -EFAULT; |
79 | 78 | ||
80 | *ppos += count; | 79 | *ppos += count; |
81 | chars_remaining -= count; | 80 | chars_remaining -= count; |
82 | ptr += count; | 81 | ptr += count; |
83 | 82 | ||
84 | return_VALUE(count); | 83 | return count; |
85 | } | 84 | } |
86 | 85 | ||
87 | static int acpi_system_close_event(struct inode *inode, struct file *file) | 86 | static int acpi_system_close_event(struct inode *inode, struct file *file) |
@@ -112,10 +111,9 @@ static int __init acpi_event_init(void) | |||
112 | struct proc_dir_entry *entry; | 111 | struct proc_dir_entry *entry; |
113 | int error = 0; | 112 | int error = 0; |
114 | 113 | ||
115 | ACPI_FUNCTION_TRACE("acpi_event_init"); | ||
116 | 114 | ||
117 | if (acpi_disabled) | 115 | if (acpi_disabled) |
118 | return_VALUE(0); | 116 | return 0; |
119 | 117 | ||
120 | /* 'event' [R] */ | 118 | /* 'event' [R] */ |
121 | entry = create_proc_entry("event", S_IRUSR, acpi_root_dir); | 119 | entry = create_proc_entry("event", S_IRUSR, acpi_root_dir); |
@@ -124,7 +122,7 @@ static int __init acpi_event_init(void) | |||
124 | else { | 122 | else { |
125 | error = -ENODEV; | 123 | error = -ENODEV; |
126 | } | 124 | } |
127 | return_VALUE(error); | 125 | return error; |
128 | } | 126 | } |
129 | 127 | ||
130 | subsys_initcall(acpi_event_init); | 128 | subsys_initcall(acpi_event_init); |