On 10/19/2015 07:28 PM, Huang Rui wrote:
This patch enables power1_input attribute for Carrizo platform.
Signed-off-by: Huang Rui <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Guenter Roeck <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Ingo Molnar <[email protected]>
---
drivers/hwmon/fam15h_power.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
index 41d022e..a090adf 100644
--- a/drivers/hwmon/fam15h_power.c
+++ b/drivers/hwmon/fam15h_power.c
@@ -115,8 +115,11 @@ static int fam15h_power_init_attrs(struct pci_dev *pdev,
{
int n = FAM15H_MIN_NUM_ATTRS;
struct attribute **fam15h_power_attrs;
+ struct cpuinfo_x86 *c = &boot_cpu_data;
- if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf)
+ if (c->x86 == 0x15 &&
+ ((c->x86_model <= 0xf) ||
Please no unnecessary ( ).
+ (c->x86_model >= 0x60 && c->x86_model <= 0x6f)))
Those are acceptable to clarify that the && has precedence on purpose,
but "(c->x86_model <= 0xf)" is really unnecessary (and inconsistent
with the rest of the code).
n += 1;
fam15h_power_attrs = devm_kcalloc(&pdev->dev, n,
@@ -128,7 +131,9 @@ static int fam15h_power_init_attrs(struct pci_dev *pdev,
n = 0;
fam15h_power_attrs[n++] = &dev_attr_power1_crit.attr;
- if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf)
+ if (c->x86 == 0x15 &&
+ ((c->x86_model <= 0xf) ||
+ (c->x86_model >= 0x60 && c->x86_model <= 0x6f)))
Same here.
fam15h_power_attrs[n++] = &dev_attr_power1_input.attr;
data->fam15h_power_group.attrs = fam15h_power_attrs;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
