Commit 68ccfaa8 authored by Thomas Renninger's avatar Thomas Renninger Committed by Len Brown

ACPI: thermal: Replace pointer with name in trip_points

For users with active thermal trip points, they need
the fan's name, rather than its address, to understand
where to look to observe and control fan state.
Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 0efabac9
...@@ -827,6 +827,7 @@ static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file) ...@@ -827,6 +827,7 @@ static int acpi_thermal_temp_open_fs(struct inode *inode, struct file *file)
static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset) static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
{ {
struct acpi_thermal *tz = seq->private; struct acpi_thermal *tz = seq->private;
struct acpi_device *device;
int i = 0; int i = 0;
int j = 0; int j = 0;
...@@ -849,9 +850,8 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset) ...@@ -849,9 +850,8 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
tz->trips.passive.tc1, tz->trips.passive.tc2, tz->trips.passive.tc1, tz->trips.passive.tc2,
tz->trips.passive.tsp); tz->trips.passive.tsp);
for (j = 0; j < tz->trips.passive.devices.count; j++) { for (j = 0; j < tz->trips.passive.devices.count; j++) {
acpi_bus_get_device(tz->trips.passive.devices.handles[j], &device);
seq_printf(seq, "0x%p ", seq_printf(seq, "%4.4s ", acpi_device_bid(device));
tz->trips.passive.devices.handles[j]);
} }
seq_puts(seq, "\n"); seq_puts(seq, "\n");
} }
...@@ -862,9 +862,10 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset) ...@@ -862,9 +862,10 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
seq_printf(seq, "active[%d]: %ld C: devices=", seq_printf(seq, "active[%d]: %ld C: devices=",
i, i,
KELVIN_TO_CELSIUS(tz->trips.active[i].temperature)); KELVIN_TO_CELSIUS(tz->trips.active[i].temperature));
for (j = 0; j < tz->trips.active[i].devices.count; j++) for (j = 0; j < tz->trips.active[i].devices.count; j++){
seq_printf(seq, "0x%p ", acpi_bus_get_device(tz->trips.active[i].devices.handles[j], &device);
tz->trips.active[i].devices.handles[j]); seq_printf(seq, "%4.4s ", acpi_device_bid(device));
}
seq_puts(seq, "\n"); seq_puts(seq, "\n");
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment