From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28F4B1DB94D for ; Wed, 4 Sep 2024 19:57:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725479835; cv=none; b=B9GGy1N6Yv+oTdJ+URt1IndDITupZIr8iCIBTTCb+vkx5EgyKrC29L/dDbrONmjmaijmT0vPgVVHKGihIdvTyfn7ggLEBvQ3ZZ7Ut0+ak2V/11s0PVkoUcW3br2tgvOchBtZ6d8j/s8pgTykTLKqRMiuu/2K74mnJni3Qs711B0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725479835; c=relaxed/simple; bh=2JKbg4yAomSa2lCLAxvDK8rug+J90DosygVA/s5G7c0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=W/nQr2jLNU9oyRwW9FB1EoWwPJ+n8PS4LTM+fvKQknYxifcSJvnUYvAAmW5EveWjlehWFezc5EZ+cmVZBxWU0Pd9YqEOHBZ9u9Nr5LR8Xa8SIVlnpyKpuR9ZjkMZFa/7HBpNor5J/3qd5DtlB4prfc2fnU92v+w6wxvSrilLkKM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=deVzRf3g; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="deVzRf3g" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725479832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R68qYfGkW/a8842ERb0qGpkAxJP/22WSWV3GhDUBb/A=; b=deVzRf3gbHUKhojrhp50sL2UOn9RNLGgpDf1SbLJcEjs+p1+lccQy1/gIVX+QR365e8LXS U3BsTItObmecNKqyoDWBIqNA7Ca81kXtHee9J0ylCzzmdRTKlgM7ckV1bAznyOz+NAQdnY X2m7UTYey46q6aAIrmsZk2FyVChknqY= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-693-hJ46DA5oP3iRfq4upyOR3Q-1; Wed, 04 Sep 2024 15:57:11 -0400 X-MC-Unique: hJ46DA5oP3iRfq4upyOR3Q-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a868403dbdeso4911166b.1 for ; Wed, 04 Sep 2024 12:57:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725479830; x=1726084630; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=R68qYfGkW/a8842ERb0qGpkAxJP/22WSWV3GhDUBb/A=; b=JzYHgoOCUjCxK3aw/tHBMw6GPqyNgOW3I5+ZPEmKH4ZcOxBYJDWMYLv2GUtqkzJ7Tl Z9KlNPYqqFDcqcGc6mYg+GlFY8jWPbq0bMiVrwEkt+sVeKvuT9FQMNCTULvsdECv/Ve5 WU1hZxO16D/ng1C5PmJ1E6+noBG4P6tAd8MB+NYvVwuNre1q8m7kRhQ5FgzcqMoU7rpM AM1qiRPxgKCtM5kX6Y+gnSnN7beHat7MLBqbCaXI746giQTilVbdZ1N4FE6QL0zPBYfN 12mw5iDjGQ7RnRz5XO/E2LUO1fyP2THb2ldhvL7cl1zN2GtBXENC407LDFwIBHuGPWwG Eg5Q== X-Gm-Message-State: AOJu0YxnlIPG1lFDFx0VAIAjNmHGTpDcUL3yfjl08jjXXxOzIlIFixuK QVgCHHBE7nk3280Kb3NpCp2g0LKiuODxom4sotzxSsPx96lPlZniJjouQ3Egy7XzFfD+wQUijYk CXjySjFBLtoml4gtNJbPyFs2i+UqYGMp1L9pGw9VTV4agDJDwVBF5c9+f X-Received: by 2002:a17:907:9729:b0:a7a:a0c2:8be9 with SMTP id a640c23a62f3a-a897f84d369mr1923726766b.18.1725479830460; Wed, 04 Sep 2024 12:57:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF5cP4vNqhH3jpIoCKOZgGubwlCRWIPRfbFu++5wMJojKJgyj8OkkCJRV1sqLqUjTTsO6JC4A== X-Received: by 2002:a17:907:9729:b0:a7a:a0c2:8be9 with SMTP id a640c23a62f3a-a897f84d369mr1923724366b.18.1725479829873; Wed, 04 Sep 2024 12:57:09 -0700 (PDT) Received: from ?IPV6:2001:1c00:c32:7800:5bfa:a036:83f0:f9ec? (2001-1c00-0c32-7800-5bfa-a036-83f0-f9ec.cable.dynamic.v6.ziggo.nl. [2001:1c00:c32:7800:5bfa:a036:83f0:f9ec]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c3cc6a5cfasm273014a12.92.2024.09.04.12.57.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 04 Sep 2024 12:57:09 -0700 (PDT) Message-ID: <6c161ffb-93bb-44f5-a47d-b93561da7cb4@redhat.com> Date: Wed, 4 Sep 2024 21:57:08 +0200 Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH RFC v3 3/9] power: supply: hwmon: register battery properties To: =?UTF-8?Q?Thomas_Wei=C3=9Fschuh?= , Sebastian Reichel , Armin Wolf Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org References: <20240904-power-supply-extensions-v3-0-62efeb93f8ec@weissschuh.net> <20240904-power-supply-extensions-v3-3-62efeb93f8ec@weissschuh.net> Content-Language: en-US, nl From: Hans de Goede In-Reply-To: <20240904-power-supply-extensions-v3-3-62efeb93f8ec@weissschuh.net> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hi, On 9/4/24 9:25 PM, Thomas Weißschuh wrote: > Instead of only registering properties from the psy_desc itself, > also register the ones from the battery. > Use power_supply_has_property() for this test which makes the logic also > easier to read. > > Signed-off-by: Thomas Weißschuh Thanks, patch looks good to me: Reviewed-by: Hans de Goede Regards, Hans > --- > drivers/power/supply/power_supply_hwmon.c | 52 +++++++++++++++---------------- > 1 file changed, 26 insertions(+), 26 deletions(-) > > diff --git a/drivers/power/supply/power_supply_hwmon.c b/drivers/power/supply/power_supply_hwmon.c > index baacefbdf768..1c1ad3e1d81f 100644 > --- a/drivers/power/supply/power_supply_hwmon.c > +++ b/drivers/power/supply/power_supply_hwmon.c > @@ -8,6 +8,8 @@ > #include > #include > > +#include "power_supply.h" > + > struct power_supply_hwmon { > struct power_supply *psy; > unsigned long *props; > @@ -347,9 +349,28 @@ static const struct hwmon_chip_info power_supply_hwmon_chip_info = { > .info = power_supply_hwmon_info, > }; > > +static const enum power_supply_property power_supply_hwmon_props[] = { > + POWER_SUPPLY_PROP_CURRENT_AVG, > + POWER_SUPPLY_PROP_CURRENT_MAX, > + POWER_SUPPLY_PROP_CURRENT_NOW, > + POWER_SUPPLY_PROP_POWER_AVG, > + POWER_SUPPLY_PROP_POWER_NOW, > + POWER_SUPPLY_PROP_TEMP, > + POWER_SUPPLY_PROP_TEMP_MAX, > + POWER_SUPPLY_PROP_TEMP_MIN, > + POWER_SUPPLY_PROP_TEMP_ALERT_MIN, > + POWER_SUPPLY_PROP_TEMP_ALERT_MAX, > + POWER_SUPPLY_PROP_TEMP_AMBIENT, > + POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN, > + POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX, > + POWER_SUPPLY_PROP_VOLTAGE_AVG, > + POWER_SUPPLY_PROP_VOLTAGE_MIN, > + POWER_SUPPLY_PROP_VOLTAGE_MAX, > + POWER_SUPPLY_PROP_VOLTAGE_NOW, > +}; > + > int power_supply_add_hwmon_sysfs(struct power_supply *psy) > { > - const struct power_supply_desc *desc = psy->desc; > struct power_supply_hwmon *psyhw; > struct device *dev = &psy->dev; > struct device *hwmon; > @@ -375,32 +396,11 @@ int power_supply_add_hwmon_sysfs(struct power_supply *psy) > goto error; > } > > - for (i = 0; i < desc->num_properties; i++) { > - const enum power_supply_property prop = desc->properties[i]; > - > - switch (prop) { > - case POWER_SUPPLY_PROP_CURRENT_AVG: > - case POWER_SUPPLY_PROP_CURRENT_MAX: > - case POWER_SUPPLY_PROP_CURRENT_NOW: > - case POWER_SUPPLY_PROP_POWER_AVG: > - case POWER_SUPPLY_PROP_POWER_NOW: > - case POWER_SUPPLY_PROP_TEMP: > - case POWER_SUPPLY_PROP_TEMP_MAX: > - case POWER_SUPPLY_PROP_TEMP_MIN: > - case POWER_SUPPLY_PROP_TEMP_ALERT_MIN: > - case POWER_SUPPLY_PROP_TEMP_ALERT_MAX: > - case POWER_SUPPLY_PROP_TEMP_AMBIENT: > - case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN: > - case POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX: > - case POWER_SUPPLY_PROP_VOLTAGE_AVG: > - case POWER_SUPPLY_PROP_VOLTAGE_MIN: > - case POWER_SUPPLY_PROP_VOLTAGE_MAX: > - case POWER_SUPPLY_PROP_VOLTAGE_NOW: > + for (i = 0; i < ARRAY_SIZE(power_supply_hwmon_props); i++) { > + const enum power_supply_property prop = power_supply_hwmon_props[i]; > + > + if (power_supply_has_property(psy, prop)) > set_bit(prop, psyhw->props); > - break; > - default: > - break; > - } > } > > name = psy->desc->name; >