From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1206C4338F for ; Tue, 24 Aug 2021 20:45:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A3289611AF for ; Tue, 24 Aug 2021 20:45:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235207AbhHXUqB (ORCPT ); Tue, 24 Aug 2021 16:46:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233289AbhHXUqA (ORCPT ); Tue, 24 Aug 2021 16:46:00 -0400 Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E35B6C061757 for ; Tue, 24 Aug 2021 13:45:15 -0700 (PDT) Received: by mail-ot1-x335.google.com with SMTP id i8-20020a056830402800b0051afc3e373aso38359376ots.5 for ; Tue, 24 Aug 2021 13:45:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=TGWrX68Y6rPvIsIXfjsyZ1fKRmsVjzBaZFJhAE1LrTo=; b=IS3VNMlX9D5KMkyfaxAlmGQOUzj660DkJnqLWIQMBri54rhWw/wamr4t3oKpIX9uD1 vJt/73/SsrY1Sb59ZLz7jEUEpMlC6wMqJAXlJlrNHp9R2DhDPNGdy68q/DbDKjscHxf1 DsphHIvVnMLs3CTxG81dWAZYKc5wfUBAHVLZ/Arj1cks6M4IZ+SFdBHjBAyXevMlsV9C su4zYptzXBijZVGrr7AM0/M09FTo880uQPUCRzSbF3ac6/wTekhtF2UzQX26faxmTFuD mL06xp9TACU5llvfGuteuFZiF1yMaJ1diL7kQ8nxMKTawBRzaH4ZlQ5kY3if9V+eaT9+ egsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=TGWrX68Y6rPvIsIXfjsyZ1fKRmsVjzBaZFJhAE1LrTo=; b=DzH+Yx0ma0MIKv0NVZiNigDWKCDOB7yLkD6JOt68FqtvSZIQ9dnr2ltE8PtZhjy2o2 yKWroN2KpE7O63c4IJpErLOEYHEsBIf5WJv1AihewZZMMUZHF64gdbsSBbf/wwTXZDUB diz0pVke1qjHaYrmBtcUWfxdf5iAerv2jNSZWmWMIxI/zN8rxpwWu1yQOOBW/MhHJ5ze OLyLrQK9Z3PjBqxCuextFmyNkx/jDYoO0HTo242tWe+KERciVMtfxsi4/Kuf+4cK7mVA Qu5HCrNWb8XR2SwNk6REQ8xiBX2A3haAZ/+wTy8pOhTpt76YfCxd44NOYqC4FtA3nl0p aHiQ== X-Gm-Message-State: AOAM531EuI21vUClrgyXzQs8Kg6sm6FoWBo9dNq7aMNo1o/QqP0mDZUg Nk7R5fA9MyM9N0PxQp86ZBM= X-Google-Smtp-Source: ABdhPJyfs12z1EUNTH+ypFm4apzBWNxz0d86oWwLnWDqaxMgok4M9zbKmqflBWyDnlG3/x0tfrGWTw== X-Received: by 2002:a9d:6e8:: with SMTP id 95mr29261614otx.273.1629837915332; Tue, 24 Aug 2021 13:45:15 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id r20sm3108970oot.16.2021.08.24.13.45.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 13:45:14 -0700 (PDT) Sender: Guenter Roeck Date: Tue, 24 Aug 2021 13:45:13 -0700 From: Guenter Roeck To: W_Armin@gmx.de Cc: jdelvare@suse.com, linux-hwmon@vger.kernel.org Subject: Re: [PATCH RESEND] hwmon: (i5500_temp) Convert to devm_hwmon_device_register_with_info Message-ID: <20210824204513.GA3417535@roeck-us.net> References: <20210823170724.7662-1-W_Armin@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210823170724.7662-1-W_Armin@gmx.de> Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org On Mon, Aug 23, 2021 at 07:07:24PM +0200, W_Armin@gmx.de wrote: > From: Armin Wolf > > Use devm_hwmon_device_register_with_info() to simplify code > and use register defines instead of hardcoded values. > Also use the BIT() macro for the alarms. > > Only compile-tested. > Hmm, I don't see anything obviously wrong, but I'd still like to have this tested before applying it. Guenter > Signed-off-by: Armin Wolf > --- > drivers/hwmon/i5500_temp.c | 114 ++++++++++++++++++++----------------- > 1 file changed, 61 insertions(+), 53 deletions(-) > > -- > 2.20.1 > > diff --git a/drivers/hwmon/i5500_temp.c b/drivers/hwmon/i5500_temp.c > index 360f5aee1394..05f68e9c9477 100644 > --- a/drivers/hwmon/i5500_temp.c > +++ b/drivers/hwmon/i5500_temp.c > @@ -5,6 +5,7 @@ > * Copyright (C) 2012, 2014 Jean Delvare > */ > > +#include > #include > #include > #include > @@ -12,7 +13,6 @@ > #include > #include > #include > -#include > #include > #include > > @@ -29,69 +29,78 @@ > #define REG_CTCTRL 0xF7 > #define REG_TSTIMER 0xF8 > > -/* > - * Sysfs stuff > - */ > - > -/* Sensor resolution : 0.5 degree C */ > -static ssize_t temp1_input_show(struct device *dev, > - struct device_attribute *devattr, char *buf) > +static umode_t i5500_is_visible(const void *drvdata, enum hwmon_sensor_types type, u32 attr, > + int channel) > { > - struct pci_dev *pdev = to_pci_dev(dev->parent); > - long temp; > - u16 tsthrhi; > - s8 tsfsc; > - > - pci_read_config_word(pdev, REG_TSTHRHI, &tsthrhi); > - pci_read_config_byte(pdev, REG_TSFSC, &tsfsc); > - temp = ((long)tsthrhi - tsfsc) * 500; > - > - return sprintf(buf, "%ld\n", temp); > + return 0444; > } > > -static ssize_t thresh_show(struct device *dev, > - struct device_attribute *devattr, char *buf) > +static int i5500_read(struct device *dev, enum hwmon_sensor_types type, u32 attr, int channel, > + long *val) > { > struct pci_dev *pdev = to_pci_dev(dev->parent); > - int reg = to_sensor_dev_attr(devattr)->index; > - long temp; > u16 tsthr; > + s8 tsfsc; > + u8 ctsts; > > - pci_read_config_word(pdev, reg, &tsthr); > - temp = tsthr * 500; > + switch (type) { > + case hwmon_temp: > + switch (attr) { > + /* Sensor resolution : 0.5 degree C */ > + case hwmon_temp_input: > + pci_read_config_word(pdev, REG_TSTHRHI, &tsthr); > + pci_read_config_byte(pdev, REG_TSFSC, &tsfsc); > + *val = (tsthr - tsfsc) * 500; > + return 0; > + case hwmon_temp_max: > + pci_read_config_word(pdev, REG_TSTHRHI, &tsthr); > + *val = tsthr * 500; > + return 0; > + case hwmon_temp_max_hyst: > + pci_read_config_word(pdev, REG_TSTHRLO, &tsthr); > + *val = tsthr * 500; > + return 0; > + case hwmon_temp_crit: > + pci_read_config_word(pdev, REG_TSTHRCATA, &tsthr); > + *val = tsthr * 500; > + return 0; > + case hwmon_temp_max_alarm: > + pci_read_config_byte(pdev, REG_CTSTS, &ctsts); > + *val = !!(ctsts & BIT(1)); > + return 0; > + case hwmon_temp_crit_alarm: > + pci_read_config_byte(pdev, REG_CTSTS, &ctsts); > + *val = !!(ctsts & BIT(0)); > + return 0; > + default: > + break; > + } > + break; > + default: > + break; > + } > > - return sprintf(buf, "%ld\n", temp); > + return -EOPNOTSUPP; > } > > -static ssize_t alarm_show(struct device *dev, > - struct device_attribute *devattr, char *buf) > -{ > - struct pci_dev *pdev = to_pci_dev(dev->parent); > - int nr = to_sensor_dev_attr(devattr)->index; > - u8 ctsts; > - > - pci_read_config_byte(pdev, REG_CTSTS, &ctsts); > - return sprintf(buf, "%u\n", (unsigned int)ctsts & (1 << nr)); > -} > +static const struct hwmon_ops i5500_ops = { > + .is_visible = i5500_is_visible, > + .read = i5500_read, > +}; > > -static DEVICE_ATTR_RO(temp1_input); > -static SENSOR_DEVICE_ATTR_RO(temp1_crit, thresh, 0xE2); > -static SENSOR_DEVICE_ATTR_RO(temp1_max_hyst, thresh, 0xEC); > -static SENSOR_DEVICE_ATTR_RO(temp1_max, thresh, 0xEE); > -static SENSOR_DEVICE_ATTR_RO(temp1_crit_alarm, alarm, 0); > -static SENSOR_DEVICE_ATTR_RO(temp1_max_alarm, alarm, 1); > - > -static struct attribute *i5500_temp_attrs[] = { > - &dev_attr_temp1_input.attr, > - &sensor_dev_attr_temp1_crit.dev_attr.attr, > - &sensor_dev_attr_temp1_max_hyst.dev_attr.attr, > - &sensor_dev_attr_temp1_max.dev_attr.attr, > - &sensor_dev_attr_temp1_crit_alarm.dev_attr.attr, > - &sensor_dev_attr_temp1_max_alarm.dev_attr.attr, > +static const struct hwmon_channel_info *i5500_info[] = { > + HWMON_CHANNEL_INFO(chip, HWMON_C_REGISTER_TZ), > + HWMON_CHANNEL_INFO(temp, > + HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MAX_HYST | HWMON_T_CRIT | > + HWMON_T_MAX_ALARM | HWMON_T_CRIT_ALARM > + ), > NULL > }; > > -ATTRIBUTE_GROUPS(i5500_temp); > +static const struct hwmon_chip_info i5500_chip_info = { > + .ops = &i5500_ops, > + .info = i5500_info, > +}; > > static const struct pci_device_id i5500_temp_ids[] = { > { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x3438) }, > @@ -121,9 +130,8 @@ static int i5500_temp_probe(struct pci_dev *pdev, > return -ENODEV; > } > > - hwmon_dev = devm_hwmon_device_register_with_groups(&pdev->dev, > - "intel5500", NULL, > - i5500_temp_groups); > + hwmon_dev = devm_hwmon_device_register_with_info(&pdev->dev, "intel5500", NULL, > + &i5500_chip_info, NULL); > return PTR_ERR_OR_ZERO(hwmon_dev); > }