From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752149AbcBPBlF (ORCPT ); Mon, 15 Feb 2016 20:41:05 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:46403 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751815AbcBPBlD (ORCPT ); Mon, 15 Feb 2016 20:41:03 -0500 Subject: Re: [PATCH 2/2] hwmon: (scpi) add energy meter support To: Sudeep Holla , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org References: <1455028377-12728-1-git-send-email-sudeep.holla@arm.com> <1455028377-12728-2-git-send-email-sudeep.holla@arm.com> Cc: lm-sensors@lm-sensors.org, Jean Delvare , Punit Agrawal From: Guenter Roeck Message-ID: <56C27E2C.5030506@roeck-us.net> Date: Mon, 15 Feb 2016 17:41:00 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <1455028377-12728-2-git-send-email-sudeep.holla@arm.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=-1.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-Authenticated-Sender: bh-25.webhostbox.net: 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 02/09/2016 06:32 AM, Sudeep Holla wrote: > SCPI specification v1.1 adds support for energy sensors. This patch > adds support for the same. > > Cc: Punit Agrawal > Signed-off-by: Sudeep Holla Acked-by: Guenter Roeck > --- > drivers/hwmon/scpi-hwmon.c | 8 ++++++++ > include/linux/scpi_protocol.h | 1 + > 2 files changed, 9 insertions(+) > > diff --git a/drivers/hwmon/scpi-hwmon.c b/drivers/hwmon/scpi-hwmon.c > index 7101b14b5137..912b449c8303 100644 > --- a/drivers/hwmon/scpi-hwmon.c > +++ b/drivers/hwmon/scpi-hwmon.c > @@ -114,6 +114,7 @@ static int scpi_hwmon_probe(struct platform_device *pdev) > { > u16 nr_sensors, i; > int num_temp = 0, num_volt = 0, num_current = 0, num_power = 0; > + int num_energy = 0; > struct scpi_ops *scpi_ops; > struct device *hwdev, *dev = &pdev->dev; > struct scpi_sensors *scpi_sensors; > @@ -182,6 +183,13 @@ static int scpi_hwmon_probe(struct platform_device *pdev) > "power%d_label", num_power + 1); > num_power++; > break; > + case ENERGY: > + snprintf(sensor->input, sizeof(sensor->input), > + "energy%d_input", num_energy + 1); > + snprintf(sensor->label, sizeof(sensor->input), > + "energy%d_label", num_energy + 1); > + num_energy++; > + break; > default: > continue; > } > diff --git a/include/linux/scpi_protocol.h b/include/linux/scpi_protocol.h > index ecd248d46281..35de50a65665 100644 > --- a/include/linux/scpi_protocol.h > +++ b/include/linux/scpi_protocol.h > @@ -33,6 +33,7 @@ enum scpi_sensor_class { > VOLTAGE, > CURRENT, > POWER, > + ENERGY, > }; > > struct scpi_sensor_info { >