From patchwork Tue Jul 18 21:42:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 108185 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp6479145qge; Tue, 18 Jul 2017 14:43:50 -0700 (PDT) X-Received: by 10.99.106.201 with SMTP id f192mr3835904pgc.124.1500414230016; Tue, 18 Jul 2017 14:43:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500414230; cv=none; d=google.com; s=arc-20160816; b=akVwiB24aZ4JKypq2OWL3Lpp95iAD5w+kutMG51WWoEgA7FNjh233ek0+JqWVh19BA uwJikStdMKCgAYXnWohvBmvK+81EMtaL23oKuFWqKhMXYVhnaSRkeUaikA8VMSIhHwQT I/wTE+xNT+DouoepYEJ0nj65QJZmoKKTc92w4y6OoNppNg53zIPN5bKEfF0WUpGg3DSO MqMyQxNvT39rCyl8J1BA4/Aggmh98qasnZctz6nyKhMFsMpgf9OSU9jkQeVfQ0pe7AxY OWEHQ4OsiSVsPxI3Nw3lslZoM94oVsE5yKwP2Io5/Xc522VmPLEP8l60tRaRYkSrXjk8 WYpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Ffrj6pKE/zvrdLwDPASL35Gcfjlhb2nPqLNNY/IVEQ0=; b=OTAP74Gerfdma1QmHRPmiItWT9TbQSjbMx2NRNxX0CHNR8nfivrrPmifwfrhywLbS/ /SEmB5nAvCoa6+BAsNyvvDdoPHbFhAoV0Kjf3jzX7EsVr5SGjl8Vm28bN1Dd+ApPjhNv e4N6KBrpSHOw9xmF8RrSIY1AA57wmpzkU8boYLCOVFfwL2Gfd0t+pnOYtRCOgecrn8n4 fhBeyUm7MhZ69uhD+7btN7Z+UygUenq9EJI0vLa6HyIBHBHOjJRa0JH9dVQoWSqf4lQe wWRMnUQzjPzY55dhMo2zPn75GL6z3fkuo2Z/Oud2Wh0yYcLqZsCPu/OeR0qiBRfGOk83 /7TA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 69si2677257plc.138.2017.07.18.14.43.49; Tue, 18 Jul 2017 14:43:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-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 devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752039AbdGRVns (ORCPT + 7 others); Tue, 18 Jul 2017 17:43:48 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:32798 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751725AbdGRVnq (ORCPT ); Tue, 18 Jul 2017 17:43:46 -0400 Received: by mail-pg0-f68.google.com with SMTP id z1so4351339pgs.0; Tue, 18 Jul 2017 14:43:46 -0700 (PDT) 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; bh=Swz2ZXVHx4ueMWhVfIur+pZaCyZV0T1YtlT0twD9osA=; b=NMbLxEqnUl7UT/sBjI8qXTzglPMyii9RK+BdKiSbKIKZpJ/Zac2S87fudbQu2Djycj xyqxkMwbLNKPX1/B1UYrW7rPdWTQfzoYi1UFiu/aQyeiJAjLv+xknwyBmTqgH2EfcD65 FgUjsuFj8WU+3ZS9FiYoewF/oEX7nYfIJUbt8pkJ8qv1qwYNGVIjJhMp4uDP7dgaRScp ePj8jixx33NlOMQbKVGP+Z2cSXXPttsjBMUweva5p1ehdFt3DPGe0bw5JzIUIGNgbnEN EeXUUX6ENt1g3e3wOhrTSU2w52gusMLL9frd2UJR7Uy64p1P2fYLmQdO3hYmb9a0eosz GSgw== X-Gm-Message-State: AIVw111osIOoXmdmogfrVkuuRootsnXD/Vhhyez95HUVDG6JFf8VR+Yb UPFGdNJaRm8iQTRyQ24= X-Received: by 10.98.67.82 with SMTP id q79mr3799662pfa.121.1500414226036; Tue, 18 Jul 2017 14:43:46 -0700 (PDT) Received: from localhost.localdomain (24-223-123-72.static.usa-companies.net. [24.223.123.72]) by smtp.googlemail.com with ESMTPSA id r207sm7186560pfr.106.2017.07.18.14.43.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 14:43:45 -0700 (PDT) From: Rob Herring To: Catalin Marinas , Will Deacon Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64: Convert to using %pOF instead of full_name Date: Tue, 18 Jul 2017 16:42:42 -0500 Message-Id: <20170718214339.7774-2-robh@kernel.org> X-Mailer: git-send-email 2.11.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node. Signed-off-by: Rob Herring Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org --- arch/arm64/kernel/cpu_ops.c | 4 ++-- arch/arm64/kernel/smp.c | 12 ++++++------ arch/arm64/kernel/topology.c | 22 +++++++++++----------- 3 files changed, 19 insertions(+), 19 deletions(-) -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c index e137ceaf5016..d16978213c5b 100644 --- a/arch/arm64/kernel/cpu_ops.c +++ b/arch/arm64/kernel/cpu_ops.c @@ -82,8 +82,8 @@ static const char *__init cpu_read_enable_method(int cpu) * Don't warn spuriously. */ if (cpu != 0) - pr_err("%s: missing enable-method property\n", - dn->full_name); + pr_err("%pOF: missing enable-method property\n", + dn); } } else { enable_method = acpi_get_enable_method(cpu); diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 321119881abf..dc66e6ec3a99 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -469,7 +469,7 @@ static u64 __init of_get_cpu_mpidr(struct device_node *dn) */ cell = of_get_property(dn, "reg", NULL); if (!cell) { - pr_err("%s: missing reg property\n", dn->full_name); + pr_err("%pOF: missing reg property\n", dn); return INVALID_HWID; } @@ -478,7 +478,7 @@ static u64 __init of_get_cpu_mpidr(struct device_node *dn) * Non affinity bits must be set to 0 in the DT */ if (hwid & ~MPIDR_HWID_BITMASK) { - pr_err("%s: invalid reg property\n", dn->full_name); + pr_err("%pOF: invalid reg property\n", dn); return INVALID_HWID; } return hwid; @@ -627,8 +627,8 @@ static void __init of_parse_and_init_cpus(void) goto next; if (is_mpidr_duplicate(cpu_count, hwid)) { - pr_err("%s: duplicate cpu reg properties in the DT\n", - dn->full_name); + pr_err("%pOF: duplicate cpu reg properties in the DT\n", + dn); goto next; } @@ -640,8 +640,8 @@ static void __init of_parse_and_init_cpus(void) */ if (hwid == cpu_logical_map(0)) { if (bootcpu_valid) { - pr_err("%s: duplicate boot cpu reg property in DT\n", - dn->full_name); + pr_err("%pOF: duplicate boot cpu reg property in DT\n", + dn); goto next; } diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 79244c75eaec..8d48b233e6ce 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -45,7 +45,7 @@ static int __init get_cpu_for_node(struct device_node *node) } } - pr_crit("Unable to find CPU node for %s\n", cpu_node->full_name); + pr_crit("Unable to find CPU node for %pOF\n", cpu_node); of_node_put(cpu_node); return -1; @@ -71,8 +71,8 @@ static int __init parse_core(struct device_node *core, int cluster_id, cpu_topology[cpu].core_id = core_id; cpu_topology[cpu].thread_id = i; } else { - pr_err("%s: Can't get CPU for thread\n", - t->full_name); + pr_err("%pOF: Can't get CPU for thread\n", + t); of_node_put(t); return -EINVAL; } @@ -84,15 +84,15 @@ static int __init parse_core(struct device_node *core, int cluster_id, cpu = get_cpu_for_node(core); if (cpu >= 0) { if (!leaf) { - pr_err("%s: Core has both threads and CPU\n", - core->full_name); + pr_err("%pOF: Core has both threads and CPU\n", + core); return -EINVAL; } cpu_topology[cpu].cluster_id = cluster_id; cpu_topology[cpu].core_id = core_id; } else if (leaf) { - pr_err("%s: Can't get CPU for leaf core\n", core->full_name); + pr_err("%pOF: Can't get CPU for leaf core\n", core); return -EINVAL; } @@ -137,8 +137,8 @@ static int __init parse_cluster(struct device_node *cluster, int depth) has_cores = true; if (depth == 0) { - pr_err("%s: cpu-map children should be clusters\n", - c->full_name); + pr_err("%pOF: cpu-map children should be clusters\n", + c); of_node_put(c); return -EINVAL; } @@ -146,8 +146,8 @@ static int __init parse_cluster(struct device_node *cluster, int depth) if (leaf) { ret = parse_core(c, cluster_id, core_id++); } else { - pr_err("%s: Non-leaf cluster with core %s\n", - cluster->full_name, name); + pr_err("%pOF: Non-leaf cluster with core %s\n", + cluster, name); ret = -EINVAL; } @@ -159,7 +159,7 @@ static int __init parse_cluster(struct device_node *cluster, int depth) } while (c); if (leaf && !has_cores) - pr_warn("%s: empty cluster\n", cluster->full_name); + pr_warn("%pOF: empty cluster\n", cluster); if (leaf) cluster_id++;