From patchwork Wed Nov 7 22:31:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 150452 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp93111ljp; Wed, 7 Nov 2018 14:31:59 -0800 (PST) X-Google-Smtp-Source: AJdET5cljs0Xo6SL7s7AXzsiU9xtvJMXVvez0c0AEwzPMTY03XWYtVH2jdSqJW7XvRMFrU3WH4eS X-Received: by 2002:a17:902:7a2:: with SMTP id 31-v6mr2070180plj.277.1541629918931; Wed, 07 Nov 2018 14:31:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541629918; cv=none; d=google.com; s=arc-20160816; b=FnKCKgD4mwkVoZ7PviDAbUu62XXs/3fOFnEW9TN/MMnBI+HQJKdOLNZWEBw2Y2hG+e baV2N9iLYtwiGs6qu0m64gj7VsGuCGRYQ6qeOgSZUz39miXC0PlLkh4nkOB7ncqJ/O9A xpQtsOIizVQwrC3zmzL1WlM26JuwY6JjR2ZaoySecPxWwda01y+G8bV6nKYqDBA4840i Q8H18f4myD2IsQFutV8m7CkPi3TarqQKrgjW3wbFQouoM58lUToGC2lPWi0sg0oLqVgY OQjxUbtMfgijKWUSJmKfjh4Br39q98z8POQUIXIix7SvTKwQhvWDkIMMzDHAX1282Ahx HdJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=QzI8JHdrx3gMSYYSAWjUWfYDzwDDbM1CO6mI41xpJGw=; b=Ekrm8238KhkuwqLCId/t2AjnemUQsWGWmhhZ5CxsDnFTPL4oksqQuOIhIl/a2TCcqz CbHFIQYezOCsTsz+QbJuy/xOR540kB1ru9yfJAByv4buXXozZfTcLTIqHVuE7YE7QZIv jDrTmuIjSczeeXuEqv+G8qmoRq/9hI0mzsikqN7gJjXgUrEJVvWs/K/LSvHfwcfyAFxa OS1psd1p8XfMco3jmAZK57/oHYhB08UoVbBX9bl/CprrxpZ8qGbQQI1ABBAHoF7d2KON sEOxiT9Tuw8JaLKNWmpNi6vh32+S/FPUZ1LNZsT1VXoL+8yx3aibVVZl+MrafW/1+cvH watQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o61-v6si2068773pld.187.2018.11.07.14.31.58; Wed, 07 Nov 2018 14:31:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728177AbeKHIEX (ORCPT + 32 others); Thu, 8 Nov 2018 03:04:23 -0500 Received: from mail-ot1-f68.google.com ([209.85.210.68]:42787 "EHLO mail-ot1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728080AbeKHIEX (ORCPT ); Thu, 8 Nov 2018 03:04:23 -0500 Received: by mail-ot1-f68.google.com with SMTP id n46so12110023otb.9; Wed, 07 Nov 2018 14:31:55 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=QzI8JHdrx3gMSYYSAWjUWfYDzwDDbM1CO6mI41xpJGw=; b=iNipIryrABO8B97uPY646/9dkP9qT17nPVLD+4TydaCyQsSd/z4LLrkbkdScSjgRSi 0Nn/yXHWur6hib+mS0Xa6DF+j6Hhufhwd9TuXPBhCwOokH6fS4bEdkq6aKQNuiggSf+u YxBbOCRkszo6682MRnI2b9zVYwLG2NykVYCr4zrR1H16ByoToVMSvGiHRmy9rAIGVXS5 gORle8Sy0y0Sf7zRu4L3mQHv/j9Kj4OxFFlTCuVor3IhyaMh7q77pojIjdwEVCVJah+E SUrCTqJeAj+j0UMY7YkqwJknLABCqgiKhW6NCQ5JsL9f9QP+MQl8HzcLepBQ+7YrbQ8s tIdw== X-Gm-Message-State: AGRZ1gIyCQlwplo2k1lKLzThdQZUm9yJIfT/UYBnnmhyzntjIyvDo+vz X37GIzcq+ize1aUyVQzw5A== X-Received: by 2002:a9d:2987:: with SMTP id n7mr1316096otb.339.1541629915084; Wed, 07 Nov 2018 14:31:55 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id f9sm750959oth.17.2018.11.07.14.31.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 14:31:54 -0800 (PST) From: Rob Herring To: "David S. Miller" Cc: Frank Rowand , linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org Subject: [PATCH 2/8] of: Drop full path from Sparc PDT full_name Date: Wed, 7 Nov 2018 16:31:45 -0600 Message-Id: <20181107223151.14991-3-robh@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181107223151.14991-1-robh@kernel.org> References: <20181107223151.14991-1-robh@kernel.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that there are no more users of path_component_name outside of the PDT code and users of device_node.full_name are converted to use "%pOF" printf specifier, we can align Sparc with other arches and store just the base node name and unit address in full_name. This makes path_component_name redundant, so it can be removed. As full_name is used by printf specifiers, set it as early as possible. Cc: Frank Rowand Signed-off-by: Rob Herring --- drivers/of/pdt.c | 26 +++----------------------- include/linux/of.h | 1 - 2 files changed, 3 insertions(+), 24 deletions(-) -- 2.19.1 diff --git a/drivers/of/pdt.c b/drivers/of/pdt.c index 013e65de074a..40321b6b82e2 100644 --- a/drivers/of/pdt.c +++ b/drivers/of/pdt.c @@ -32,24 +32,7 @@ unsigned int of_pdt_unique_id __initdata; static char * __init of_pdt_build_full_name(struct device_node *dp) { - int len, ourlen, plen; - char *n; - - dp->path_component_name = build_path_component(dp); - - plen = strlen(dp->parent->full_name); - ourlen = strlen(dp->path_component_name); - len = ourlen + plen + 2; - - n = prom_early_alloc(len); - strcpy(n, dp->parent->full_name); - if (!of_node_is_root(dp->parent)) { - strcpy(n + plen, "/"); - plen++; - } - strcpy(n + plen, dp->path_component_name); - - return n; + return build_path_component(dp); } #else /* CONFIG_SPARC */ @@ -181,6 +164,8 @@ static struct device_node * __init of_pdt_create_node(phandle node, dp->properties = of_pdt_build_prop_list(node); + dp->full_name = of_pdt_build_full_name(dp); + irq_trans_init(dp); return dp; @@ -204,8 +189,6 @@ static struct device_node * __init of_pdt_build_tree(struct device_node *parent, ret = dp; prev_sibling = dp; - dp->full_name = of_pdt_build_full_name(dp); - dp->child = of_pdt_build_tree(dp, of_pdt_prom_ops->getchild(node)); if (of_pdt_build_more) @@ -228,9 +211,6 @@ void __init of_pdt_build_devicetree(phandle root_node, struct of_pdt_ops *ops) of_pdt_prom_ops = ops; of_root = of_pdt_create_node(root_node, NULL); -#if defined(CONFIG_SPARC) - of_root->path_component_name = ""; -#endif of_root->full_name = "/"; of_root->child = of_pdt_build_tree(of_root, diff --git a/include/linux/of.h b/include/linux/of.h index a5aee3c438ad..0fe5bef81a7e 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -66,7 +66,6 @@ struct device_node { unsigned long _flags; void *data; #if defined(CONFIG_SPARC) - const char *path_component_name; unsigned int unique_id; struct of_irq_controller *irq_trans; #endif