From patchwork Tue Aug 31 10:21:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 504652 Delivered-To: patches@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp2636336jai; Tue, 31 Aug 2021 03:21:37 -0700 (PDT) X-Received: by 2002:a05:6512:3c94:: with SMTP id h20mr14282382lfv.170.1630405297757; Tue, 31 Aug 2021 03:21:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630405297; cv=none; d=google.com; s=arc-20160816; b=bWVtSZ+/jLkWlDL7pAoQlzoqzBIDmPLz0gJTyazbX6XJD3JtfpPxdqZz8fsX+aLGPZ Z7e+Y/fin7e9c27s82fzYB8gIGyEsopK//z5rWjREkydkkQ+hjesO5Bk4B0JeNRy6GRn bIOWCtaH92lf0tHM3MPfW2TyDmz1jOl7U7XGS0KndjdXYt/ag48YGsovz8c9dnApjixo BeDxaJt6DfDwYjtIiwPkXVoFVPs03/VWroYzahamoA8vbXS9Co4RNizRZ1JhaQAoLM8P 71SPIVkxWb6whrQ8YWqsf2Qyby5SynxIt5k2jVz7Novaze+eyntL8qSHAbZIYIW2iy8m A/ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=SaQiFvhNq7368+94ke7tCwmU8u/vT5hggbptJeHOcYo=; b=fNu54SGYztlfjqOjx9TtBVOAT8tLdylkobFPyFgiOZjlJA98d/023A8ZjPXr6X6h+Q oYu/jzGtxNghsmEglZIz/HD+44A6Y4fmaDeSttNEemYKvgLE+prxHpdLpIZnllUrtGlx Y7MhEjM9zKVsOoNFSvNv8BZcSww1zSICpqZOEbXK5u2iv38pGH1E2IOPmdXAVEoR1sBk ZdMXxjpds6Rj9iAVoRHqKIZGu8kAaR1bp6Un1W/ekRrKKR1tkqPexGQ5HELTQ0PXEWyk XMX7JX6rsvjs2MC2i45enDjR7vwAvKLdW7bqiTZsbXApxyjIrZrFjF/MABCddK4vfejY sg2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="OQ8Bc7H/"; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id b17sor3988335lft.94.2021.08.31.03.21.37 for (Google Transport Security); Tue, 31 Aug 2021 03:21:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="OQ8Bc7H/"; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SaQiFvhNq7368+94ke7tCwmU8u/vT5hggbptJeHOcYo=; b=OQ8Bc7H/j7dY8F+7/WWLC8l2pfhCHESOHANGP40xBtANdPJhhCoXsFJE8/mcMLl6lb bKH2QIzdw8Z3bHXrkZiaqsbkx9pU/7qQ3ikcKw5DsQifxf7w4S6mRQvk1kjExY/XCrBL x1f8EISuWCWhIkqllRSOpX0AE8ii8ONpNBj807/cw5HxrPKESUk9MTq7svvQQbGk8/DX PT6GqOiEW+D9hmrjFv2Db0EVRCjLTLSb9b0DMV2Id/Pszpdi0+sYj409rQuECO1+Zsdc D/bTITEW67QawE23Dz0u5spWInPsJ8lnUGdvyx/xOZCTiDWTFogofPOFgZWhd5KL98sg ZfmA== 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=SaQiFvhNq7368+94ke7tCwmU8u/vT5hggbptJeHOcYo=; b=aiFuVsJPEmK99MoSZ2B0La5uT/5saUtAPTrGiy0iZSzi3FK6eySLGUJ5wyScbQTfNh l6t2CxE4BnfR/X9Pcpee4U5GvE/MhwFSF7r6KCDJ7knFQrx3s1qOlt8qbWbnhJiomyGp 4PoRx6mYRKEZLzeXkDPwGj8OzzBNJSXcTVmxj4UyVPKYffXa1aqH48VljClw14CfKwUv GoAPkw8Kr/Cev2fnjVzvyIcEqc6dJQusy15cAQM7i8Kg+eQP+aCQpx3xp9MIWWnSVOL5 qQERJZ+h7QQJUKkPquj+3ShDuBrsH7686U0fFkOqLbi9tVkBujt4Q+Z6tJw+MGF8mdRx AHAQ== X-Gm-Message-State: AOAM531rOeyn5MCP/JKKIeMlDem1VWFp9jn1DlGlCqFjTX9LDzq38Hiz dJqty3J3fnImrLuRlUIydr0c59MP X-Google-Smtp-Source: ABdhPJysTQHKjj6sHl08LoVd8gzCM5Oi5pHDfNeAo1fs+lBAhuD47ThIpXSDKSYwaxeOL6peufsGZQ== X-Received: by 2002:a05:6512:2210:: with SMTP id h16mr20684305lfu.621.1630405297014; Tue, 31 Aug 2021 03:21:37 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-155-4-129-146.NA.cust.bahnhof.se. [155.4.129.146]) by smtp.gmail.com with ESMTPSA id b21sm753714lfi.104.2021.08.31.03.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Aug 2021 03:21:36 -0700 (PDT) From: Ulf Hansson To: Saravana Kannan , Rob Herring , devicetree@vger.kernel.org Cc: "Rafael J . Wysocki" , Stephen Boyd , Dmitry Osipenko , Ulf Hansson , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] of: property: fw_devlink: Rename 'node_not_dev' to 'optional_con_dev' Date: Tue, 31 Aug 2021 12:21:25 +0200 Message-Id: <20210831102125.624661-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 In the struct supplier_bindings the member 'node_not_dev' is described as "The consumer node containing the property is never a device.", but that doesn't match the behaviour of the code in of_link_property(). To make the behaviour consistent with the description, let's rename the member to "optional_con_dev" and clarify the corresponding comment. Signed-off-by: Ulf Hansson --- drivers/of/property.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.25.1 Signed-off-by: Ulf Hansson diff --git a/drivers/of/property.c b/drivers/of/property.c index 6c028632f425..2babb1807228 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -1249,7 +1249,8 @@ static struct device_node *parse_##fname(struct device_node *np, \ * @parse_prop.index: For properties holding a list of phandles, this is the * index into the list * @optional: Describes whether a supplier is mandatory or not - * @node_not_dev: The consumer node containing the property is never a device. + * @optional_con_dev: The consumer node containing the property may not be a + * device, then try finding one from an ancestor node. * * Returns: * parse_prop() return values are @@ -1261,7 +1262,7 @@ struct supplier_bindings { struct device_node *(*parse_prop)(struct device_node *np, const char *prop_name, int index); bool optional; - bool node_not_dev; + bool optional_con_dev; }; DEFINE_SIMPLE_PROP(clocks, "clocks", "#clock-cells") @@ -1370,7 +1371,7 @@ static const struct supplier_bindings of_supplier_bindings[] = { { .parse_prop = parse_pinctrl6, }, { .parse_prop = parse_pinctrl7, }, { .parse_prop = parse_pinctrl8, }, - { .parse_prop = parse_remote_endpoint, .node_not_dev = true, }, + { .parse_prop = parse_remote_endpoint, .optional_con_dev = true, }, { .parse_prop = parse_gpio_compat, }, { .parse_prop = parse_interrupts, }, { .parse_prop = parse_regulators, }, @@ -1415,7 +1416,7 @@ static int of_link_property(struct device_node *con_np, const char *prop_name) while ((phandle = s->parse_prop(con_np, prop_name, i))) { struct device_node *con_dev_np; - con_dev_np = s->node_not_dev + con_dev_np = s->optional_con_dev ? of_get_compat_node(con_np) : of_node_get(con_np); matched = true;