From patchwork Wed Sep 1 23:59:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 12470577 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=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 16705C432BE for ; Wed, 1 Sep 2021 23:59:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F15136108E for ; Wed, 1 Sep 2021 23:59:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242547AbhIBAAk (ORCPT ); Wed, 1 Sep 2021 20:00:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242374AbhIBAAj (ORCPT ); Wed, 1 Sep 2021 20:00:39 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49199C061757 for ; Wed, 1 Sep 2021 16:59:42 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id x19so219571pfu.4 for ; Wed, 01 Sep 2021 16:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VVEKpVhauYNJ1ILO18GzLhj0cTIWBln8xn/kIaFE4Zk=; b=a0U/g5gMiauvSfdJA24Q9gAMJsJpAAv3wbzNJjANEkTSQ6ZcazygfvPjXmDvJbfJRN MKOqYJNao/5bmFsusyOH6gziaJLDYcQMlgNIZtCu5osijNKqKn215xzzE2Sv8VKhjhBd 6AYwdWpJt+iBBr/bklXqDqTOCrybNX62uH2vI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=VVEKpVhauYNJ1ILO18GzLhj0cTIWBln8xn/kIaFE4Zk=; b=Z4ohQlgPdMQ1yF5hbvoP0wfASroqvbBs6pKxkypAs7KjP+ad4wDQznVvnUH8ldVzp+ Dsd7DTnmYHujv/v+bpWFEP3SLUUNda09UBtt8l+YADAU46Ti4GN4v62XkWoew1pBxNoc 0Tsl56HZUyTbWvM47AN4stG5J2PkawSsF7REyhCs2cTmOU5W1jbxLlh2zAt6XXGGFbXg Ch2PcwvSOypLb3EFN0roiU88rL7b6iaMOZ6QuISBPjDI2Fj3h4buOGFcUzveflC68MMm GEG85asJ5sTkWb0tH8Obj9jXRqnjNDDqPiuVNX0bBFZ0TsVT5/bj9pUyhimLdlZSFUh3 rTyA== X-Gm-Message-State: AOAM531SsZZYX4yxcr471wlVfC9HL7sU8KpxVBAYU373GF6F97hN0PYU 0QGl1GWa7AUVV9m26s+fBRdxtg== X-Google-Smtp-Source: ABdhPJwDBjoTuTHaB/WX510aqdaeHu3oym+8oKmcYBmdvcvaxzfghosuICAisrlkBSlyr3Mk0uJRFQ== X-Received: by 2002:a62:1888:0:b029:3c9:7957:519b with SMTP id 130-20020a6218880000b02903c97957519bmr410778pfy.17.1630540781790; Wed, 01 Sep 2021 16:59:41 -0700 (PDT) Received: from localhost ([2620:15c:202:201:fbd:3633:cc64:337d]) by smtp.gmail.com with UTF8SMTPSA id g2sm104681pfr.35.2021.09.01.16.59.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 01 Sep 2021 16:59:41 -0700 (PDT) From: Matthias Kaehlcke To: Sebastian Reichel Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Matthias Kaehlcke Subject: [PATCH] power: supply: core: Add psy_has_property() Date: Wed, 1 Sep 2021 16:59:36 -0700 Message-Id: <20210901165911.1.I61edd8453dd683a125623b4173988b438033c0af@changeid> X-Mailer: git-send-email 2.33.0.153.gba50c8fa24-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Add the helper psy_has_property() to check whether a power supply has a given property and use it instead of ad hoc iterations over the property list in multiple locations. Signed-off-by: Matthias Kaehlcke --- drivers/power/supply/power_supply_core.c | 65 ++++++++++++++---------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index d99e2f11c183..9309b33ed3ec 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -956,26 +956,41 @@ static struct thermal_zone_device_ops psy_tzd_ops = { .get_temp = power_supply_read_temp, }; +static bool psy_has_property(const struct power_supply_desc *psy_desc, + enum power_supply_property psp) +{ + bool found = false; + int i; + + for (i = 0; i < psy_desc->num_properties; i++) { + if (psy_desc->properties[i] == psp) { + found = true; + break; + } + } + + return found; +} + static int psy_register_thermal(struct power_supply *psy) { - int i, ret; + int ret; if (psy->desc->no_thermal) return 0; /* Register battery zone device psy reports temperature */ - for (i = 0; i < psy->desc->num_properties; i++) { - if (psy->desc->properties[i] == POWER_SUPPLY_PROP_TEMP) { - psy->tzd = thermal_zone_device_register(psy->desc->name, - 0, 0, psy, &psy_tzd_ops, NULL, 0, 0); - if (IS_ERR(psy->tzd)) - return PTR_ERR(psy->tzd); - ret = thermal_zone_device_enable(psy->tzd); - if (ret) - thermal_zone_device_unregister(psy->tzd); - return ret; - } + if (psy_has_property(psy->desc, POWER_SUPPLY_PROP_TEMP)) { + psy->tzd = thermal_zone_device_register(psy->desc->name, + 0, 0, psy, &psy_tzd_ops, NULL, 0, 0); + if (IS_ERR(psy->tzd)) + return PTR_ERR(psy->tzd); + ret = thermal_zone_device_enable(psy->tzd); + if (ret) + thermal_zone_device_unregister(psy->tzd); + return ret; } + return 0; } @@ -1046,18 +1061,14 @@ static const struct thermal_cooling_device_ops psy_tcd_ops = { static int psy_register_cooler(struct power_supply *psy) { - int i; - /* Register for cooling device if psy can control charging */ - for (i = 0; i < psy->desc->num_properties; i++) { - if (psy->desc->properties[i] == - POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT) { - psy->tcd = thermal_cooling_device_register( - (char *)psy->desc->name, - psy, &psy_tcd_ops); - return PTR_ERR_OR_ZERO(psy->tcd); - } + if (psy_has_property(psy->desc, POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT)) { + psy->tcd = thermal_cooling_device_register( + (char *)psy->desc->name, + psy, &psy_tcd_ops); + return PTR_ERR_OR_ZERO(psy->tcd); } + return 0; } @@ -1095,7 +1106,7 @@ __power_supply_register(struct device *parent, { struct device *dev; struct power_supply *psy; - int i, rc; + int rc; if (!parent) pr_warn("%s: Expected proper parent device for '%s'\n", @@ -1104,11 +1115,9 @@ __power_supply_register(struct device *parent, if (!desc || !desc->name || !desc->properties || !desc->num_properties) return ERR_PTR(-EINVAL); - for (i = 0; i < desc->num_properties; ++i) { - if ((desc->properties[i] == POWER_SUPPLY_PROP_USB_TYPE) && - (!desc->usb_types || !desc->num_usb_types)) - return ERR_PTR(-EINVAL); - } + if (psy_has_property(desc, POWER_SUPPLY_PROP_USB_TYPE) && + (!desc->usb_types || !desc->num_usb_types)) + return ERR_PTR(-EINVAL); psy = kzalloc(sizeof(*psy), GFP_KERNEL); if (!psy)