diff options
author | Huang Rui <ray.huang@amd.com> | 2016-04-06 03:44:15 -0400 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2016-04-19 09:32:35 -0400 |
commit | 1d28e01628aebab8fe403e7e9d0760f3787763d5 (patch) | |
tree | 87a7544d026dba96ddb9663ff72df8f86d82e42b | |
parent | a6e232f78698953e6fd9c2f4c95e16d5f5f9d0c3 (diff) |
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>
-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 { | |||
78 | unsigned long power_period; | 78 | unsigned long power_period; |
79 | }; | 79 | }; |
80 | 80 | ||
81 | static bool is_carrizo_or_later(void) | ||
82 | { | ||
83 | return boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60; | ||
84 | } | ||
85 | |||
81 | static ssize_t show_power(struct device *dev, | 86 | static ssize_t show_power(struct device *dev, |
82 | struct device_attribute *attr, char *buf) | 87 | struct device_attribute *attr, char *buf) |
83 | { | 88 | { |
@@ -94,7 +99,7 @@ static ssize_t show_power(struct device *dev, | |||
94 | * On Carrizo and later platforms, TdpRunAvgAccCap bit field | 99 | * On Carrizo and later platforms, TdpRunAvgAccCap bit field |
95 | * is extended to 4:31 from 4:25. | 100 | * is extended to 4:31 from 4:25. |
96 | */ | 101 | */ |
97 | if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60) { | 102 | if (is_carrizo_or_later()) { |
98 | running_avg_capture = val >> 4; | 103 | running_avg_capture = val >> 4; |
99 | running_avg_capture = sign_extend32(running_avg_capture, 27); | 104 | running_avg_capture = sign_extend32(running_avg_capture, 27); |
100 | } else { | 105 | } else { |
@@ -111,7 +116,7 @@ static ssize_t show_power(struct device *dev, | |||
111 | * On Carrizo and later platforms, ApmTdpLimit bit field | 116 | * On Carrizo and later platforms, ApmTdpLimit bit field |
112 | * is extended to 16:31 from 16:28. | 117 | * is extended to 16:31 from 16:28. |
113 | */ | 118 | */ |
114 | if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model >= 0x60) | 119 | if (is_carrizo_or_later()) |
115 | tdp_limit = val >> 16; | 120 | tdp_limit = val >> 16; |
116 | else | 121 | else |
117 | tdp_limit = (val >> 16) & 0x1fff; | 122 | tdp_limit = (val >> 16) & 0x1fff; |