From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752757AbbJWNqF (ORCPT ); Fri, 23 Oct 2015 09:46:05 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:42298 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752165AbbJWNqD (ORCPT ); Fri, 23 Oct 2015 09:46:03 -0400 Subject: Re: [PATCH v2 02/10] hwmon: (fam15h_power) Enable power1_input on AMD Carrizo To: Huang Rui , Borislav Petkov , Peter Zijlstra , Jean Delvare , Andy Lutomirski , Andreas Herrmann , Thomas Gleixner , Ingo Molnar , "Rafael J. Wysocki" , Len Brown , John Stultz , =?UTF-8?B?RnLDqWTDqXJpYyBXZWlzYmVja2Vy?= References: <1445308109-17970-1-git-send-email-ray.huang@amd.com> <1445308109-17970-3-git-send-email-ray.huang@amd.com> Cc: lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org, x86@kernel.org, Andreas Herrmann , Aravind Gopalakrishnan , Borislav Petkov , Fengguang Wu , Aaron Lu , Tony Li From: Guenter Roeck Message-ID: <562A3A17.1080800@roeck-us.net> Date: Fri, 23 Oct 2015 06:45:59 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <1445308109-17970-3-git-send-email-ray.huang@amd.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=0.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: linux@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 10/19/2015 07:28 PM, Huang Rui wrote: > This patch enables power1_input attribute for Carrizo platform. > > Signed-off-by: Huang Rui > Cc: Borislav Petkov > Cc: Guenter Roeck > Cc: Peter Zijlstra > Cc: Ingo Molnar > --- > 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; >