ACPI: proc.c: remove ACPI_FUNCTION_TRACE

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / sleep / proc.c

diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index 631ee2ee2ca0028193ab5d52dee2acc0d15579f2..1c4851ff2657bbb875813f81a02c098ed1ae13f1 100644 (file)
--- 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)
 {
        int i;
 
-       ACPI_FUNCTION_TRACE("acpi_system_sleep_seq_show");
-
        for (i = 0; i <= ACPI_STATE_S5; i++) {
                if (sleep_states[i]) {
                        seq_printf(seq, "S%d ", i);
@@ -93,8 +91,6 @@ static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
        unsigned char rtc_control = 0;
        unsigned long flags;
 
-       ACPI_FUNCTION_TRACE("acpi_system_alarm_seq_show");
-
        spin_lock_irqsave(&rtc_lock, flags);
 
        sec = CMOS_READ(RTC_SECONDS_ALARM);
@@ -227,13 +223,11 @@ acpi_system_write_alarm(struct file *file,
        int adjust = 0;
        unsigned char rtc_control = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_system_write_alarm");
-
        if (count > sizeof(alarm_string) - 1)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        if (copy_from_user(alarm_string, buffer, count))
-               return_VALUE(-EFAULT);
+               return -EFAULT;
 
        alarm_string[count] = '\0';
 
@@ -334,7 +328,7 @@ acpi_system_write_alarm(struct file *file,
 
        result = 0;
       end:
-       return_VALUE(result ? result : count);
+       return result ? result : count;
 }
 #endif                         /* HAVE_ACPI_LEGACY_ALARM */
 
@@ -367,7 +361,7 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
                if (ldev)
                        seq_printf(seq, "%s:%s",
                                   ldev->bus ? ldev->bus->name : "no-bus",
-                                  ldev->bus_id);
+                                  dev_name(ldev));
                seq_printf(seq, "\n");
                put_device(ldev);