From patchwork Tue Jul 18 21:42:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 108241 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp6495445qge; Tue, 18 Jul 2017 15:02:13 -0700 (PDT) X-Received: by 10.99.127.11 with SMTP id a11mr3804878pgd.213.1500415333179; Tue, 18 Jul 2017 15:02:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500415333; cv=none; d=google.com; s=arc-20160816; b=DSAVuBZHpTpbJ4PdxIusGXRcLAsGbQQxMFndOe09ojYYEx/nylmn1q7uf2UUUUeQEi N8hfORIPL9yryiTD3YKNQXJ6rFsfErvyMwB8Fmku98as7NiFtFm0l5NTNBMDq5ZRBhwy OsooQDprfVYLUf7wWz+E6o7VvJdFh+7zCum5iPljf0MI/iQ7TNRkGNSLs3PXnYPjN1/S 4BGuz1+pjzSt/48ldrktlc/GAL+UTK7oXrm2b3JjzhbCCvwylc46Lqz3ja+qEk5Ig8V6 b17ovcKzMjFTjkT0MTeHW1yOn89t4RulYgO7KRXv16BB+rtLypGy52LZ4lstGgKyI2+R JPaQ== 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=aZM+IrvjuPBMkicRAGG/5BeVUidQLhfqtCyceyrRLv0=; b=Frw0PixslxL7hFHkosfHqumfsdLCrYmHtGhYKJBEkCeJUV4RJBBgLyMOO3CsUPV91U GaiTdRiCJeu45KMd9Z9X2HoO521BQP+ZbUkd4lMSngrnLlubvXUPjGqZZyocMf2pV9pR NNcIDfHtuPpBV6LDzHAZGd1BmA/iZ3GItQdjQjer4dU/eXqAFSMBZXJ8oapJgBUv/r6n wNk+DH07QEP+T9FsV4coGVugIXSYSHMy0lnR0E9XYBUUhzK74itE74lbIreuTgpSFJZJ TzudBI0/wKB4wQVebi0FI+5NM157r0AGmYdSzdri8RWKlRsD90CiBz1F2ygriFNwuwlO 704A== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d73si2623488pga.296.2017.07.18.15.02.12; Tue, 18 Jul 2017 15:02:13 -0700 (PDT) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752948AbdGRWCJ (ORCPT + 25 others); Tue, 18 Jul 2017 18:02:09 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:34951 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751725AbdGRVnv (ORCPT ); Tue, 18 Jul 2017 17:43:51 -0400 Received: by mail-pg0-f66.google.com with SMTP id d193so4331068pgc.2; Tue, 18 Jul 2017 14:43:51 -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=aZM+IrvjuPBMkicRAGG/5BeVUidQLhfqtCyceyrRLv0=; b=N9157Ewlj1k7lugRKJ4NE4L8stcnrwj+VzQnDj605HHqmh0pPxhkppPDbiFdq4eY4o LqLBWj3A7NvQKW/iTvrE6Lrkta2Dg0lWXL+10f3Hx2SkL+mIjmJWG8sCXBkqcLwQS5jg xowYg9b8GWggsuDJTZDwX+bs0i/AOFK7h37W58KZq7QC3cxHaGT7t9DsRiX5mhgMrnhI dq/gIuBsiqQK0hqKOS0TcT22eDCuIQT2P83wj0ksk2wsa4ixapxX8VnvrRAyr0EDaNkK QPBLceyRux2O3mvPowNpkYxfU3caOK0C1DvrwQejX1WCCCUIkKNSCNXm7u0RtdDsaLAA +vNg== X-Gm-Message-State: AIVw110OOfBm0M/jtqgkJPWUCLKdf211Ehlk0ypzqO19Ws40JRX0TRTX xe4biR4m+rjJmQOa2VQ= X-Received: by 10.101.91.137 with SMTP id i9mr3724545pgr.27.1500414231356; Tue, 18 Jul 2017 14:43:51 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 14:43:50 -0700 (PDT) From: Rob Herring To: Ralf Baechle Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mips@linux-mips.org Subject: [PATCH] MIPS: Convert to using %pOF instead of full_name Date: Tue, 18 Jul 2017 16:42:45 -0500 Message-Id: <20170718214339.7774-5-robh@kernel.org> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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: Ralf Baechle Cc: linux-mips@linux-mips.org --- arch/mips/ath79/clock.c | 9 ++++----- arch/mips/pci/pci-legacy.c | 2 +- arch/mips/pci/pci-rt3883.c | 11 +++++------ 3 files changed, 10 insertions(+), 12 deletions(-) -- 2.11.0 diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c index fa845953f736..6b1000b6a6a6 100644 --- a/arch/mips/ath79/clock.c +++ b/arch/mips/ath79/clock.c @@ -487,17 +487,16 @@ static void __init ath79_clocks_init_dt_ng(struct device_node *np) { struct clk *ref_clk; void __iomem *pll_base; - const char *dnfn = of_node_full_name(np); ref_clk = of_clk_get(np, 0); if (IS_ERR(ref_clk)) { - pr_err("%s: of_clk_get failed\n", dnfn); + pr_err("%pOF: of_clk_get failed\n", np); goto err; } pll_base = of_iomap(np, 0); if (!pll_base) { - pr_err("%s: can't map pll registers\n", dnfn); + pr_err("%pOF: can't map pll registers\n", np); goto err_clk; } @@ -506,12 +505,12 @@ static void __init ath79_clocks_init_dt_ng(struct device_node *np) else if (of_device_is_compatible(np, "qca,ar9330-pll")) ar9330_clk_init(ref_clk, pll_base); else { - pr_err("%s: could not find any appropriate clk_init()\n", dnfn); + pr_err("%pOF: could not find any appropriate clk_init()\n", np); goto err_iounmap; } if (of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data)) { - pr_err("%s: could not register clk provider\n", dnfn); + pr_err("%pOF: could not register clk provider\n", np); goto err_iounmap; } diff --git a/arch/mips/pci/pci-legacy.c b/arch/mips/pci/pci-legacy.c index 174575a9a112..958f47c1f558 100644 --- a/arch/mips/pci/pci-legacy.c +++ b/arch/mips/pci/pci-legacy.c @@ -127,7 +127,7 @@ void pci_load_of_ranges(struct pci_controller *hose, struct device_node *node) struct of_pci_range range; struct of_pci_range_parser parser; - pr_info("PCI host bridge %s ranges:\n", node->full_name); + pr_info("PCI host bridge %pOF ranges:\n", node); hose->of_node = node; if (of_pci_range_parser_init(&parser, node)) diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c index 3520e9b414e7..04f8ea953297 100644 --- a/arch/mips/pci/pci-rt3883.c +++ b/arch/mips/pci/pci-rt3883.c @@ -207,8 +207,7 @@ static int rt3883_pci_irq_init(struct device *dev, irq = irq_of_parse_and_map(rpc->intc_of_node, 0); if (irq == 0) { - dev_err(dev, "%s has no IRQ", - of_node_full_name(rpc->intc_of_node)); + dev_err(dev, "%pOF has no IRQ", rpc->intc_of_node); return -EINVAL; } @@ -438,8 +437,8 @@ static int rt3883_pci_probe(struct platform_device *pdev) } if (!rpc->intc_of_node) { - dev_err(dev, "%s has no %s child node", - of_node_full_name(rpc->intc_of_node), + dev_err(dev, "%pOF has no %s child node", + rpc->intc_of_node, "interrupt controller"); return -EINVAL; } @@ -454,8 +453,8 @@ static int rt3883_pci_probe(struct platform_device *pdev) } if (!rpc->pci_controller.of_node) { - dev_err(dev, "%s has no %s child node", - of_node_full_name(rpc->intc_of_node), + dev_err(dev, "%pOF has no %s child node", + rpc->intc_of_node, "PCI host bridge"); err = -EINVAL; goto err_put_intc_node;