From patchwork Sun Apr 10 21:08:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Rowand X-Patchwork-Id: 559528 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D53AEC433F5 for ; Sun, 10 Apr 2022 21:08:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229795AbiDJVK7 (ORCPT ); Sun, 10 Apr 2022 17:10:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238437AbiDJVK6 (ORCPT ); Sun, 10 Apr 2022 17:10:58 -0400 Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE7F438B5; Sun, 10 Apr 2022 14:08:45 -0700 (PDT) Received: by mail-qt1-x831.google.com with SMTP id a11so14854398qtb.12; Sun, 10 Apr 2022 14:08:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UGOgmbV2CLj8jxKDcZFdYmxwAkEUAqPnFZxawLKIrm8=; b=RKiAvUofz1qqPGjlMc79ZwKPUQBcu/PESY9kOZ7xBH2MiQkgnmGbrni1x/E3uCzZnS JBtPGVeUoA03f+iCDvw6Z8k7JpMtbKnOxk23pdAbK6SIfGxDL+07POT5yyxsghrCLUdJ Ndnb3eBPpzw4XJ7heZGxyu9lvB+GCFqHYZ+wi6F9nDRG6TrCxra/kx66LNs0pykTGm07 V+049MERVlaKt/4HveG50op1slwTJ81Nt3lPk6Q17a8PcYXPXv7kdoYqyHFYzOM4NqQa rQwuBKDhDgu/+8dCTiUMwlDc2UE4hgKi7YPIhhRsO2d/vTw2fJ3+NidsVZyKBPb25EcX VYKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UGOgmbV2CLj8jxKDcZFdYmxwAkEUAqPnFZxawLKIrm8=; b=bHCdW3g01/8fW3kZ871gGcWV17DiQeHGBWP/5v2IBapjTztZsmAn6h/kCJ9kuvS/OC u2KIApSUe0K2nRXXHUDP/ow9mZDlvmaCYTSZoWjrYhrtElM9eQszkkRr2zPtUeqUN/kw Tm3h5qwAJF4Run0Y8S4bjK5BRkoS7PiH9Vl615z6GHfdsFtS0wATEw+SkvEvp/gI/DCG b5IU1z9kTRXZYtJDOw0OUCJxN9m8PpFUJrIEbsAcnXGi+1HoEpWkrgrYQOcf/cDVuBtP q4CViXHC+Dv8g56nvjGnIixkDmukZ2f0weDgO6Glt6EJykLZtBiYv4AwHqpwg8vpi6BA LahQ== X-Gm-Message-State: AOAM5327BU42NKy0204Xg7i26hwKeAR3UiFacF2hdh2Mu4gTZ4gsgOdy 1lZrV9/fcilemmwn9qiz3LvVU4ZXt9Q= X-Google-Smtp-Source: ABdhPJwKUYMObRXAUYWzR1OfP0IelkXJeikqH0pz09FM+XxPDHn9lgcTMejxfZwu1iXwHWxG8/LpBQ== X-Received: by 2002:a05:622a:64a:b0:2e1:d8b4:c6a1 with SMTP id a10-20020a05622a064a00b002e1d8b4c6a1mr23705422qtb.0.1649624924745; Sun, 10 Apr 2022 14:08:44 -0700 (PDT) Received: from xps8900.attlocal.net ([2600:1700:2442:6db0:b84e:f99c:2a1b:100b]) by smtp.gmail.com with ESMTPSA id i68-20020a375447000000b006809e0adfffsm18438090qkb.25.2022.04.10.14.08.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 14:08:44 -0700 (PDT) From: frowand.list@gmail.com To: Rob Herring , pantelis.antoniou@konsulko.com, Slawomir Stepien Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Slawomir Stepien , Geert Uytterhoeven , Alan Tull Subject: [PATCH v2 1/2] of: overlay: rename variables to be consistent Date: Sun, 10 Apr 2022 16:08:32 -0500 Message-Id: <20220410210833.441504-2-frowand.list@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220410210833.441504-1-frowand.list@gmail.com> References: <20220410210833.441504-1-frowand.list@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Frank Rowand Variables change name across function calls when there is not a good reason to do so. Fix by changing "fdt" to "new_fdt" and "tree" to "overlay_tree". The name disparity was confusing when creating the following commit. The name changes are in this separate commit to make review of the following commmit less complex. Signed-off-by: Frank Rowand --- Changes since v1: - This patch is added to the series. drivers/of/overlay.c | 94 ++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index d80160cf34bb..f74aa9ff67aa 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -57,7 +57,7 @@ struct fragment { * struct overlay_changeset * @id: changeset identifier * @ovcs_list: list on which we are located - * @fdt: base of memory allocated to hold aligned FDT that was unflattened to create @overlay_tree + * @new_fdt: Memory allocated to hold unflattened aligned FDT * @overlay_tree: expanded device tree that contains the fragment nodes * @count: count of fragment structures * @fragments: fragment nodes in the overlay expanded device tree @@ -67,7 +67,7 @@ struct fragment { struct overlay_changeset { int id; struct list_head ovcs_list; - const void *fdt; + const void *new_fdt; struct device_node *overlay_tree; int count; struct fragment *fragments; @@ -718,19 +718,20 @@ static struct device_node *find_target(struct device_node *info_node) /** * init_overlay_changeset() - initialize overlay changeset from overlay tree - * @ovcs: Overlay changeset to build - * @fdt: base of memory allocated to hold aligned FDT that was unflattened to create @tree - * @tree: Contains the overlay fragments and overlay fixup nodes + * @ovcs: Overlay changeset to build + * @new_fdt: Memory allocated to hold unflattened aligned FDT + * @overlay_tree: Contains the overlay fragments and overlay fixup nodes * * Initialize @ovcs. Populate @ovcs->fragments with node information from - * the top level of @tree. The relevant top level nodes are the fragment - * nodes and the __symbols__ node. Any other top level node will be ignored. + * the top level of @overlay_tree. The relevant top level nodes are the + * fragment nodes and the __symbols__ node. Any other top level node will + * be ignored. * * Return: 0 on success, -ENOMEM if memory allocation failure, -EINVAL if error - * detected in @tree, or -ENOSPC if idr_alloc() error. + * detected in @overlay_tree, or -ENOSPC if idr_alloc() error. */ static int init_overlay_changeset(struct overlay_changeset *ovcs, - const void *fdt, struct device_node *tree) + const void *new_fdt, struct device_node *overlay_tree) { struct device_node *node, *overlay_node; struct fragment *fragment; @@ -741,17 +742,17 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs, * Warn for some issues. Can not return -EINVAL for these until * of_unittest_apply_overlay() is fixed to pass these checks. */ - if (!of_node_check_flag(tree, OF_DYNAMIC)) - pr_debug("%s() tree is not dynamic\n", __func__); + if (!of_node_check_flag(overlay_tree, OF_DYNAMIC)) + pr_debug("%s() overlay_tree is not dynamic\n", __func__); - if (!of_node_check_flag(tree, OF_DETACHED)) - pr_debug("%s() tree is not detached\n", __func__); + if (!of_node_check_flag(overlay_tree, OF_DETACHED)) + pr_debug("%s() overlay_tree is not detached\n", __func__); - if (!of_node_is_root(tree)) - pr_debug("%s() tree is not root\n", __func__); + if (!of_node_is_root(overlay_tree)) + pr_debug("%s() overlay_tree is not root\n", __func__); - ovcs->overlay_tree = tree; - ovcs->fdt = fdt; + ovcs->overlay_tree = overlay_tree; + ovcs->new_fdt = new_fdt; INIT_LIST_HEAD(&ovcs->ovcs_list); @@ -764,7 +765,7 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs, cnt = 0; /* fragment nodes */ - for_each_child_of_node(tree, node) { + for_each_child_of_node(overlay_tree, node) { overlay_node = of_get_child_by_name(node, "__overlay__"); if (overlay_node) { cnt++; @@ -772,7 +773,7 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs, } } - node = of_get_child_by_name(tree, "__symbols__"); + node = of_get_child_by_name(overlay_tree, "__symbols__"); if (node) { cnt++; of_node_put(node); @@ -785,7 +786,7 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs, } cnt = 0; - for_each_child_of_node(tree, node) { + for_each_child_of_node(overlay_tree, node) { overlay_node = of_get_child_by_name(node, "__overlay__"); if (!overlay_node) continue; @@ -807,7 +808,7 @@ static int init_overlay_changeset(struct overlay_changeset *ovcs, * if there is a symbols fragment in ovcs->fragments[i] it is * the final element in the array */ - node = of_get_child_by_name(tree, "__symbols__"); + node = of_get_child_by_name(overlay_tree, "__symbols__"); if (node) { ovcs->symbols_fragment = 1; fragment = &fragments[cnt]; @@ -862,11 +863,11 @@ static void free_overlay_changeset(struct overlay_changeset *ovcs) kfree(ovcs->fragments); /* * There should be no live pointers into ovcs->overlay_tree and - * ovcs->fdt due to the policy that overlay notifiers are not allowed - * to retain pointers into the overlay devicetree. + * ovcs->new_fdt due to the policy that overlay notifiers are not + * allowed to retain pointers into the overlay devicetree. */ kfree(ovcs->overlay_tree); - kfree(ovcs->fdt); + kfree(ovcs->new_fdt); kfree(ovcs); } @@ -874,16 +875,15 @@ static void free_overlay_changeset(struct overlay_changeset *ovcs) * internal documentation * * of_overlay_apply() - Create and apply an overlay changeset - * @fdt: base of memory allocated to hold the aligned FDT - * @tree: Expanded overlay device tree - * @ovcs_id: Pointer to overlay changeset id + * @new_fdt: Memory allocated to hold the aligned FDT + * @overlay_tree: Expanded overlay device tree + * @ovcs_id: Pointer to overlay changeset id * * Creates and applies an overlay changeset. * * If an error occurs in a pre-apply notifier, then no changes are made * to the device tree. * - * A non-zero return value will not have created the changeset if error is from: * - parameter checks * - building the changeset @@ -913,29 +913,29 @@ static void free_overlay_changeset(struct overlay_changeset *ovcs) * id is returned to *ovcs_id. */ -static int of_overlay_apply(const void *fdt, struct device_node *tree, - int *ovcs_id) +static int of_overlay_apply(const void *new_fdt, + struct device_node *overlay_tree, int *ovcs_id) { struct overlay_changeset *ovcs; int ret = 0, ret_revert, ret_tmp; /* - * As of this point, fdt and tree belong to the overlay changeset. - * overlay changeset code is responsible for freeing them. + * As of this point, new_fdt and overlay_tree belong to the overlay + * changeset. overlay changeset code is responsible for freeing them. */ if (devicetree_corrupt()) { pr_err("devicetree state suspect, refuse to apply overlay\n"); - kfree(fdt); - kfree(tree); + kfree(new_fdt); + kfree(overlay_tree); ret = -EBUSY; goto out; } ovcs = kzalloc(sizeof(*ovcs), GFP_KERNEL); if (!ovcs) { - kfree(fdt); - kfree(tree); + kfree(new_fdt); + kfree(overlay_tree); ret = -ENOMEM; goto out; } @@ -943,20 +943,20 @@ static int of_overlay_apply(const void *fdt, struct device_node *tree, of_overlay_mutex_lock(); mutex_lock(&of_mutex); - ret = of_resolve_phandles(tree); + ret = of_resolve_phandles(overlay_tree); if (ret) - goto err_free_tree; + goto err_free_overlay_tree; - ret = init_overlay_changeset(ovcs, fdt, tree); + ret = init_overlay_changeset(ovcs, new_fdt, overlay_tree); if (ret) - goto err_free_tree; + goto err_free_overlay_tree; /* * after overlay_notify(), ovcs->overlay_tree related pointers may have - * leaked to drivers, so can not kfree() tree, aka ovcs->overlay_tree; - * and can not free memory containing aligned fdt. The aligned fdt - * is contained within the memory at ovcs->fdt, possibly at an offset - * from ovcs->fdt. + * leaked to drivers, so can not kfree() overlay_tree, + * aka ovcs->overlay_tree; and can not free memory containing aligned + * fdt. The aligned fdt is contained within the memory at + * ovcs->new_fdt, possibly at an offset from ovcs->new_fdt. */ ret = overlay_notify(ovcs, OF_OVERLAY_PRE_APPLY); if (ret) { @@ -997,9 +997,9 @@ static int of_overlay_apply(const void *fdt, struct device_node *tree, goto out_unlock; -err_free_tree: - kfree(fdt); - kfree(tree); +err_free_overlay_tree: + kfree(new_fdt); + kfree(overlay_tree); err_free_overlay_changeset: free_overlay_changeset(ovcs);