diff options
| author | Thomas Renninger <trenn@suse.de> | 2006-11-19 23:01:40 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-05-29 18:39:05 -0400 |
| commit | 68ccfaa8222f2a26f0689fad9e8c0c3f4c19f599 (patch) | |
| tree | 1b4048a3d11b16b222737cfdcd96012f99f698b6 /drivers/acpi | |
| parent | 0efabac9b7c8535eeb199d2f16d3eb44dc4761b2 (diff) | |
| download | linux-3.10-68ccfaa8222f2a26f0689fad9e8c0c3f4c19f599.tar.gz linux-3.10-68ccfaa8222f2a26f0689fad9e8c0c3f4c19f599.tar.bz2 linux-3.10-68ccfaa8222f2a26f0689fad9e8c0c3f4c19f599.zip | |
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: Thomas Renninger <trenn@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/thermal.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 1ada017d01e..194ecfe8b36 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -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) { struct acpi_thermal *tz = seq->private; + struct acpi_device *device; int i = 0; int j = 0; @@ -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.tsp); for (j = 0; j < tz->trips.passive.devices.count; j++) { - - seq_printf(seq, "0x%p ", - tz->trips.passive.devices.handles[j]); + acpi_bus_get_device(tz->trips.passive.devices.handles[j], &device); + seq_printf(seq, "%4.4s ", acpi_device_bid(device)); } seq_puts(seq, "\n"); } @@ -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=", i, KELVIN_TO_CELSIUS(tz->trips.active[i].temperature)); - for (j = 0; j < tz->trips.active[i].devices.count; j++) - seq_printf(seq, "0x%p ", - tz->trips.active[i].devices.handles[j]); + for (j = 0; j < tz->trips.active[i].devices.count; j++){ + acpi_bus_get_device(tz->trips.active[i].devices.handles[j], &device); + seq_printf(seq, "%4.4s ", acpi_device_bid(device)); + } seq_puts(seq, "\n"); } |