aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/sleep
diff options
context:
space:
mode:
authorLin Ming <ming.m.lin@intel.com>2008-12-16 03:49:26 -0500
committerLen Brown <len.brown@intel.com>2008-12-31 01:07:38 -0500
commit95d9a7a828aedef965234f348b916caa98be1e6c (patch)
tree8a1ac258c54c150e5549894d418e5748f676ee5e /drivers/acpi/sleep
parent0175d562a29ad052c510782c7e76bc63d5155b9b (diff)
ACPI: proc.c: remove ACPI_FUNCTION_TRACE
ACPI_FUNCTION_TRACE and return_VALUE are internal acpica functions. remove ACPI_FUNCTION_TRACE replace return_VALUE with return Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/sleep')
-rw-r--r--drivers/acpi/sleep/proc.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index 4dbc2271acf5..1c4851ff2657 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -28,8 +28,6 @@ static int acpi_system_sleep_seq_show(struct seq_file *seq, void *offset)
28{ 28{
29 int i; 29 int i;
30 30
31 ACPI_FUNCTION_TRACE("acpi_system_sleep_seq_show");
32
33 for (i = 0; i <= ACPI_STATE_S5; i++) { 31 for (i = 0; i <= ACPI_STATE_S5; i++) {
34 if (sleep_states[i]) { 32 if (sleep_states[i]) {
35 seq_printf(seq, "S%d ", i); 33 seq_printf(seq, "S%d ", i);
@@ -93,8 +91,6 @@ static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
93 unsigned char rtc_control = 0; 91 unsigned char rtc_control = 0;
94 unsigned long flags; 92 unsigned long flags;
95 93
96 ACPI_FUNCTION_TRACE("acpi_system_alarm_seq_show");
97
98 spin_lock_irqsave(&rtc_lock, flags); 94 spin_lock_irqsave(&rtc_lock, flags);
99 95
100 sec = CMOS_READ(RTC_SECONDS_ALARM); 96 sec = CMOS_READ(RTC_SECONDS_ALARM);
@@ -227,13 +223,11 @@ acpi_system_write_alarm(struct file *file,
227 int adjust = 0; 223 int adjust = 0;
228 unsigned char rtc_control = 0; 224 unsigned char rtc_control = 0;
229 225
230 ACPI_FUNCTION_TRACE("acpi_system_write_alarm");
231
232 if (count > sizeof(alarm_string) - 1) 226 if (count > sizeof(alarm_string) - 1)
233 return_VALUE(-EINVAL); 227 return -EINVAL;
234 228
235 if (copy_from_user(alarm_string, buffer, count)) 229 if (copy_from_user(alarm_string, buffer, count))
236 return_VALUE(-EFAULT); 230 return -EFAULT;
237 231
238 alarm_string[count] = '\0'; 232 alarm_string[count] = '\0';
239 233
@@ -334,7 +328,7 @@ acpi_system_write_alarm(struct file *file,
334 328
335 result = 0; 329 result = 0;
336 end: 330 end:
337 return_VALUE(result ? result : count); 331 return result ? result : count;
338} 332}
339#endif /* HAVE_ACPI_LEGACY_ALARM */ 333#endif /* HAVE_ACPI_LEGACY_ALARM */
340 334