diff options
| author | Jean Delvare <jdelvare@suse.de> | 2014-03-02 15:33:35 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-03-22 22:01:54 +0100 |
| commit | df32b39b835d5aaae3867d8d02a29ee6014ca8a6 (patch) | |
| tree | ae77d568743a0592ac7e545375107fb1b7a76681 /drivers/thermal | |
| parent | e108610d6dcb947d4a8743f8f5bcfb008982826f (diff) | |
| download | lwn-df32b39b835d5aaae3867d8d02a29ee6014ca8a6.tar.gz lwn-df32b39b835d5aaae3867d8d02a29ee6014ca8a6.zip | |
x86_pkg_temp_thermal: Do not expose as a hwmon device
commit 79786880a47a8c5b4c8146c03432b3387a07a169 upstream.
The temperature value reported by x86_pkg_temp_thermal is already
reported by the coretemp driver. So, do not expose this thermal zone
as a hwmon device, because it would be redundant.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/x86_pkg_temp_thermal.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c index 7722cb9d5a80..72573661a14a 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 { struct thermal_zone_device *tzone; }; +static const struct thermal_zone_params pkg_temp_tz_params = { + .no_hwmon = true, +}; + /* List maintaining number of package instances */ static LIST_HEAD(phy_dev_list); static DEFINE_MUTEX(phy_dev_list_mutex); @@ -446,7 +450,7 @@ static int pkg_temp_thermal_device_add(unsigned int cpu) thres_count, (thres_count == MAX_NUMBER_OF_TRIPS) ? 0x03 : 0x01, - phy_dev_entry, &tzone_ops, NULL, 0, 0); + phy_dev_entry, &tzone_ops, &pkg_temp_tz_params, 0, 0); if (IS_ERR(phy_dev_entry->tzone)) { err = PTR_ERR(phy_dev_entry->tzone); goto err_ret_free; |