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.133.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 BF57513DDA7 for ; Wed, 4 Sep 2024 19:56:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725479809; cv=none; b=bkkex++yYiyRpB7ELZDz6G97SHZ9j/bdDU4ICWSgi+qepKB9YHwuGOk6IS/WU1gTcIpCX3xN8CwH8hk8vkm+ix46Z45SAKm0angJAiHUf3XBxSLqKNVUCAqm13lR9bknPlu67qNQBLIugjhMAj964fSmzNazctezNyP4j57Ud4s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725479809; c=relaxed/simple; bh=6tk844i+icxNldvAfW+R49ukLwXtkcz600j0MfXxKyo=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=rPlRBgI5+uyMpnI6SbbgiSLr3a46sAPNr0SQBhC79GsZ7G7gO8+K7VNdwepQ0QEj92Xryz5b8pwuCEruZ34RGNj1MW6F4Fcns8B5CJVCMUC4R9SnepbUNH3X6x9cFNSW7MTM6s7gMIdLE25WfkMx4NrSARPeNQZ9eGEnqk/WQ2Y= 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=LakdnPFf; arc=none smtp.client-ip=170.10.133.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="LakdnPFf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725479806; 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=B6KR/5kQWmNiegkO5DFGDhvnugbLFLgCWTk43Wsr+3M=; b=LakdnPFfLXJrT36jQOGVAYmFzhg1c64Em/q5zNw4D+FgLPz3yOG1zhyLngszIKEiqBmZuR Qy19SwX6QUrdQZNG/4ikn2JvQXQ8ZfmIUoQlsamXSl8NTJxFvxEOOK6Ur756wXYl8IE73J XgL5uUAp9K00tpyBOpqQrVzXkCuanow= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-556-lRcz_MM6Mu-XoijeboV5Rg-1; Wed, 04 Sep 2024 15:56:45 -0400 X-MC-Unique: lRcz_MM6Mu-XoijeboV5Rg-1 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-5c25d413306so10a12.1 for ; Wed, 04 Sep 2024 12:56:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725479804; x=1726084604; 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=B6KR/5kQWmNiegkO5DFGDhvnugbLFLgCWTk43Wsr+3M=; b=E0BG0W/GHKnHKspNjPNC8VNslKv8pcxARcsClD/63c57O1wEBDuEpmv4olXz+h7kfr nR2k3t1w4BnOS0s4tTEnEGUhUafQcfu75Lxjo7SXiENtgylK5t5GVj5l7Owy5LyQgq7c RCEqk7bpJVxt6W4GMme+gwsFgU/BCxTWUEWghT75vN1drm8ilm1uB+7/sQ0Y0pJRhluv GO7VBVH6iU+HRytGJs3XayIjA7B1gZi5bjEhDkp9IPuw0aQw8s/x3MWUZRDUg2hEj2yL zGtfrBDc1UJBm6qgScwA+0kl/p+Y0HTpN8/JHK3lb/1j0p2nYhztnF0OVRlhcws47X2B AXCA== X-Forwarded-Encrypted: i=1; AJvYcCVRdp1cC+nDlTa4QFx9XaWAobBg74ZK0i9D3cWVlIrla0NSSKB5oEyXkSQMgLtmrPGDsYBO5vvE9asBqng=@vger.kernel.org X-Gm-Message-State: AOJu0YxKwEbEPZwI/kRSEh86jhDQjn1pPvAkMlip0Uq872MOpe3C+qyW ahRyUE+CY4d8tJDV7pDsJYJ+cZ+cHmRCrEcBmVr1UlyV+4NYMKQgS02lL3lHCmsSd/qJP6AMueb Wa2OVjXqy894pSgDWU7xqaPvweexG9ZV0uG71WwXFy3xFwmcXUuLAx0ewYkyDLg== X-Received: by 2002:a17:906:da82:b0:a86:83c7:e885 with SMTP id a640c23a62f3a-a89d8ab4a32mr1004287466b.63.1725479804381; Wed, 04 Sep 2024 12:56:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEGnmYBGkoRxJVJFeeUnvt218Ul+nvy0dlAfM8sPzl/OWoH0RC2VfEBzk4PyiW7u2tC6V0+NA== X-Received: by 2002:a17:906:da82:b0:a86:83c7:e885 with SMTP id a640c23a62f3a-a89d8ab4a32mr1004285366b.63.1725479803794; Wed, 04 Sep 2024 12:56:43 -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 a640c23a62f3a-a8a6236d164sm30468766b.111.2024.09.04.12.56.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 04 Sep 2024 12:56:43 -0700 (PDT) Message-ID: Date: Wed, 4 Sep 2024 21:56:42 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH RFC v3 2/9] power: supply: core: register thermal zone for battery 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-2-62efeb93f8ec@weissschuh.net> Content-Language: en-US, nl From: Hans de Goede In-Reply-To: <20240904-power-supply-extensions-v3-2-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: > power_supply_read_team() can also read the temperature from the battery. > But currently when registering the thermal zone, the battery is not > checked for POWER_SUPPLY_PROP_TEMP. > Introduce a helper which can check both the desc and the battery info > for property existence and use that. > Export the helper to the rest of the psy core because it will also be > used by different subcomponents. > > Signed-off-by: Thomas Weißschuh Thanks, patch looks good to me: Reviewed-by: Hans de Goede Regards, Hans > --- > drivers/power/supply/power_supply.h | 3 +++ > drivers/power/supply/power_supply_core.c | 14 +++++++++++++- > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/drivers/power/supply/power_supply.h b/drivers/power/supply/power_supply.h > index 3cbafc58bdad..b01faeaf7827 100644 > --- a/drivers/power/supply/power_supply.h > +++ b/drivers/power/supply/power_supply.h > @@ -13,6 +13,9 @@ struct device; > struct device_type; > struct power_supply; > > +extern bool power_supply_has_property(struct power_supply *psy, > + enum power_supply_property psp); > + > #ifdef CONFIG_SYSFS > > extern void power_supply_init_attrs(void); > diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c > index cff68c4fd63c..dcb7e4853030 100644 > --- a/drivers/power/supply/power_supply_core.c > +++ b/drivers/power/supply/power_supply_core.c > @@ -1199,6 +1199,18 @@ static bool psy_desc_has_property(const struct power_supply_desc *psy_desc, > return found; > } > > +bool power_supply_has_property(struct power_supply *psy, > + enum power_supply_property psp) > +{ > + if (psy_desc_has_property(psy->desc, psp)) > + return true; > + > + if (power_supply_battery_info_has_prop(psy->battery_info, psp)) > + return true; > + > + return false; > +} > + > int power_supply_get_property(struct power_supply *psy, > enum power_supply_property psp, > union power_supply_propval *val) > @@ -1308,7 +1320,7 @@ static int psy_register_thermal(struct power_supply *psy) > return 0; > > /* Register battery zone device psy reports temperature */ > - if (psy_desc_has_property(psy->desc, POWER_SUPPLY_PROP_TEMP)) { > + if (power_supply_has_property(psy, POWER_SUPPLY_PROP_TEMP)) { > /* Prefer our hwmon device and avoid duplicates */ > struct thermal_zone_params tzp = { > .no_hwmon = IS_ENABLED(CONFIG_POWER_SUPPLY_HWMON) >