diff options
| author | Jean Delvare <jdelvare@suse.de> | 2014-03-02 15:05:49 +0100 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-03-03 23:13:37 +0800 |
| commit | 3e4216531c442ea99cb32a69e5ef4af723e7b5a9 (patch) | |
| tree | afb8c75e3c33f0a22c694e2678a9fe3046153509 | |
| parent | 79786880a47a8c5b4c8146c03432b3387a07a169 (diff) | |
| download | op-kernel-dev-3e4216531c442ea99cb32a69e5ef4af723e7b5a9.zip op-kernel-dev-3e4216531c442ea99cb32a69e5ef4af723e7b5a9.tar.gz | |
x86_pkg_temp_thermal: Fix the thermal zone type
The thermal zone type should not include an instance number. Otherwise
each zone is considered a different type and the thermal-to-hwmon
bridge fails to group them all in a single hwmon device.
I also changed the type to "x86_pkg_temp", because "pkg" was too
generic, and other thermal drivers use an underscore, not a dash, as
a separator. Or maybe "cpu_pkg_temp" would be better?
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
| -rw-r--r-- | drivers/thermal/x86_pkg_temp_thermal.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c index 3d8d972..081fd7e 100644 --- a/drivers/thermal/x86_pkg_temp_thermal.c +++ b/drivers/thermal/x86_pkg_temp_thermal.c @@ -398,7 +398,6 @@ static int pkg_temp_thermal_device_add(unsigned int cpu) int err; u32 tj_max; struct phy_dev_entry *phy_dev_entry; - char buffer[30]; int thres_count; u32 eax, ebx, ecx, edx; u8 *temp; @@ -444,9 +443,7 @@ static int pkg_temp_thermal_device_add(unsigned int cpu) phy_dev_entry->first_cpu = cpu; phy_dev_entry->tj_max = tj_max; phy_dev_entry->ref_cnt = 1; - snprintf(buffer, sizeof(buffer), "pkg-temp-%d\n", - phy_dev_entry->phys_proc_id); - phy_dev_entry->tzone = thermal_zone_device_register(buffer, + phy_dev_entry->tzone = thermal_zone_device_register("x86_pkg_temp", thres_count, (thres_count == MAX_NUMBER_OF_TRIPS) ? 0x03 : 0x01, |
