xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwmon: (fam15h_power) Add platform check function

Browse Source 
This patch adds a platform check function to make code more readable.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Huang Rui
2016-04-06 15:44:15 +08:00
committed by Guenter Roeck
parent a6e232f786
commit 1d28e01628
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/hwmon/fam15h_power.c
View File

@@ -78,6 +78,11 @@ struct fam15h_power_data {
unsigned long power_period; unsigned long power_period;
}; };
static bool is_carrizo_or_later(void)
{
return boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60;
}
static ssize_t show_power(struct device *dev, static ssize_t show_power(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
@@ -94,7 +99,7 @@ static ssize_t show_power(struct device *dev,
* On Carrizo and later platforms, TdpRunAvgAccCap bit field * On Carrizo and later platforms, TdpRunAvgAccCap bit field
* is extended to 4:31 from 4:25. * is extended to 4:31 from 4:25.
*/ */
if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60) { if (is_carrizo_or_later()) {
running_avg_capture = val >> 4; running_avg_capture = val >> 4;
running_avg_capture = sign_extend32(running_avg_capture, 27); running_avg_capture = sign_extend32(running_avg_capture, 27);
} else { } else {
@@ -111,7 +116,7 @@ static ssize_t show_power(struct device *dev,
* On Carrizo and later platforms, ApmTdpLimit bit field * On Carrizo and later platforms, ApmTdpLimit bit field
* is extended to 16:31 from 16:28. * is extended to 16:31 from 16:28.
*/ */
if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60) if (is_carrizo_or_later())
tdp_limit = val >> 16; tdp_limit = val >> 16;
else else
tdp_limit = (val >> 16) & 0x1fff; tdp_limit = (val >> 16) & 0x1fff;