diff options
| author | Huang Rui <ray.huang@amd.com> | 2016-04-06 09:44:15 +0200 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2016-04-19 15:32:35 +0200 |
| commit | 1d28e01628aebab8fe403e7e9d0760f3787763d5 (patch) | |
| tree | 87a7544d026dba96ddb9663ff72df8f86d82e42b /drivers/hwmon/fam15h_power.c | |
| parent | hwmon: (fam15h_power) Add documentation for TDP and accumulated power algorithm (diff) | |
| download | linux-1d28e01628aebab8fe403e7e9d0760f3787763d5.tar.xz linux-1d28e01628aebab8fe403e7e9d0760f3787763d5.zip | |
hwmon: (fam15h_power) Add platform check function
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>
Diffstat (limited to 'drivers/hwmon/fam15h_power.c')
| -rw-r--r-- | drivers/hwmon/fam15h_power.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index 7d9d6976a575..eb97a9241d17 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -78,6 +78,11 @@ struct fam15h_power_data { 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, 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 * 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 = sign_extend32(running_avg_capture, 27); } else { @@ -111,7 +116,7 @@ static ssize_t show_power(struct device *dev, * On Carrizo and later platforms, ApmTdpLimit bit field * 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; else tdp_limit = (val >> 16) & 0x1fff; |