lkml.org 
[lkml]   [2015]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2 02/10] hwmon: (fam15h_power) Enable power1_input on AMD Carrizo
On Fri, Oct 23, 2015 at 06:45:59AM -0700, Guenter Roeck wrote:
> On 10/19/2015 07:28 PM, Huang Rui wrote:
> >This patch enables power1_input attribute for Carrizo platform.
> >
> >Signed-off-by: Huang Rui <ray.huang@amd.com>
> >Cc: Borislav Petkov <bp@alien8.de>
> >Cc: Guenter Roeck <linux@roeck-us.net>
> >Cc: Peter Zijlstra <peterz@infradead.org>
> >Cc: Ingo Molnar <mingo@kernel.org>
> >---
> > 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).
>

OK, I will fixed it on V3. :)

Thanks,
Rui

> > 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;
> >
>


\
 
 \ /
  Last update: 2015-10-26 03:41    [W:0.068 / U:0.920 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site