diff options
Diffstat (limited to 'drivers/thermal/x86_pkg_temp_thermal.c')
| -rw-r--r-- | drivers/thermal/x86_pkg_temp_thermal.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c index 972e1c73722a..081fd7e6a9f0 100644 --- a/drivers/thermal/x86_pkg_temp_thermal.c +++ b/drivers/thermal/x86_pkg_temp_thermal.c | |||
| @@ -68,6 +68,10 @@ struct phy_dev_entry { | |||
| 68 | struct thermal_zone_device *tzone; | 68 | struct thermal_zone_device *tzone; |
| 69 | }; | 69 | }; |
| 70 | 70 | ||
| 71 | static const struct thermal_zone_params pkg_temp_tz_params = { | ||
| 72 | .no_hwmon = true, | ||
| 73 | }; | ||
| 74 | |||
| 71 | /* List maintaining number of package instances */ | 75 | /* List maintaining number of package instances */ |
| 72 | static LIST_HEAD(phy_dev_list); | 76 | static LIST_HEAD(phy_dev_list); |
| 73 | static DEFINE_MUTEX(phy_dev_list_mutex); | 77 | static DEFINE_MUTEX(phy_dev_list_mutex); |
| @@ -394,7 +398,6 @@ static int pkg_temp_thermal_device_add(unsigned int cpu) | |||
| 394 | int err; | 398 | int err; |
| 395 | u32 tj_max; | 399 | u32 tj_max; |
| 396 | struct phy_dev_entry *phy_dev_entry; | 400 | struct phy_dev_entry *phy_dev_entry; |
| 397 | char buffer[30]; | ||
| 398 | int thres_count; | 401 | int thres_count; |
| 399 | u32 eax, ebx, ecx, edx; | 402 | u32 eax, ebx, ecx, edx; |
| 400 | u8 *temp; | 403 | u8 *temp; |
| @@ -440,13 +443,11 @@ static int pkg_temp_thermal_device_add(unsigned int cpu) | |||
| 440 | phy_dev_entry->first_cpu = cpu; | 443 | phy_dev_entry->first_cpu = cpu; |
| 441 | phy_dev_entry->tj_max = tj_max; | 444 | phy_dev_entry->tj_max = tj_max; |
| 442 | phy_dev_entry->ref_cnt = 1; | 445 | phy_dev_entry->ref_cnt = 1; |
| 443 | snprintf(buffer, sizeof(buffer), "pkg-temp-%d\n", | 446 | phy_dev_entry->tzone = thermal_zone_device_register("x86_pkg_temp", |
| 444 | phy_dev_entry->phys_proc_id); | ||
| 445 | phy_dev_entry->tzone = thermal_zone_device_register(buffer, | ||
| 446 | thres_count, | 447 | thres_count, |
| 447 | (thres_count == MAX_NUMBER_OF_TRIPS) ? | 448 | (thres_count == MAX_NUMBER_OF_TRIPS) ? |
| 448 | 0x03 : 0x01, | 449 | 0x03 : 0x01, |
| 449 | phy_dev_entry, &tzone_ops, NULL, 0, 0); | 450 | phy_dev_entry, &tzone_ops, &pkg_temp_tz_params, 0, 0); |
| 450 | if (IS_ERR(phy_dev_entry->tzone)) { | 451 | if (IS_ERR(phy_dev_entry->tzone)) { |
| 451 | err = PTR_ERR(phy_dev_entry->tzone); | 452 | err = PTR_ERR(phy_dev_entry->tzone); |
| 452 | goto err_ret_free; | 453 | goto err_ret_free; |
