From patchwork Tue Jul 18 21:43:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 108222 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp6487421qge; Tue, 18 Jul 2017 14:53:46 -0700 (PDT) X-Received: by 10.99.127.76 with SMTP id p12mr3874933pgn.258.1500414825680; Tue, 18 Jul 2017 14:53:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500414825; cv=none; d=google.com; s=arc-20160816; b=Rik+g+VuMstbu2IK2XyCun6Ki//Ig2luWsyHIizLfA4GxpcRDnxuH++unlzFSJpnrp ZyluX+znn3OzqxqGm/F8SYaclnlYVLcUlPVMIayQtX9k8oFHkWM5Y3J7lPl6uxvPurUT ke0iro5+gQ1RoJNIzaV3GmAvF8zpMxgKLzdkdVUiTZXpmaWihALAR7k6y7XrKTpJI8Ng IhP4RS2jXFgf0BIO4YbEdq8/v/7diV7qU9+4eak7nkn5jywk7pcCPl3ANhvQ2f4d/kyB Dtad2xSASpxuipfDYrGBD6K2FPjw22GF2cG4NJPfYClA+198t0jSat2cmmBe41GgKVJG LF2g== 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=GoHvtGEaj5BNELLK5fKti3B11rTnIjBsIdTNsrEMiXY=; b=V0hUFn4gqHkqmxpSbhnyf8bJlFSgc2MUeqG/RnsgDafcw40EKspivTwDKUJLotI09Q Z2UgEZ4pu1onn31VY75vdSDLAFLb7nmjaD7Ehg2ptnht8ae7JWdVWo+ZFZ1TmSsWz7ks 3MqHsRjAVk5QGRyBDJdPNPLMtzYWKJqhYnKQe6dCHZbI7TMXzseh4iAFAtG8w27eauPb HcoBJos1xQVfdEXiCBQ8tE20ZDPyimhZR2UTuWu9bizy0TWaPzhF8GzP2bOh7+ZGtN8W FjSlEzu0PRaYB74opKGm9gCuec2VHFdJIx0jbu/5mB889nrB6rGsNm8g5PeYZoUFdqsT SrsA== 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 t9si2645415pge.491.2017.07.18.14.53.45; Tue, 18 Jul 2017 14:53:45 -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 S1752518AbdGRVxo (ORCPT + 7 others); Tue, 18 Jul 2017 17:53:44 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:35023 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752116AbdGRVog (ORCPT ); Tue, 18 Jul 2017 17:44:36 -0400 Received: by mail-pf0-f194.google.com with SMTP id q85so4059436pfq.2; Tue, 18 Jul 2017 14:44:36 -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=H2KfYNxL/n/STjRAZCXNnh4AOhyrZnHd/+k5TbnwZB0=; b=ZHLOvgUFYP4GtyfuY5DGENJxg7YSYM8wAs6/h1qXmJZE92pmx19IW4ivxginM3C+x0 Noy0PToLs+iASwp643UGQJkf6OQbNxZRvMiaNo3+wgk6T5JcByOo+AXD+BPjfiOcQfN0 yy/DYzHPZAwM9kHOc7QmeoJ1mdSPiOY5mD3M0vFbdXuseRsPnAPOV8PjtaV3vjOHgzvh LS1WdmzcUHvNJqr4j1hKOkZIODmquRxqRs2t9y8L9pk82AVI8aRZ3YLTz4BvYUc3Q7Qx 705PabgmKsSZGerWA4bAfeq1uQsj8gSv24cs04CEsiV3leCW1F0UGF3/2OVe3cNJTYFT El6w== X-Gm-Message-State: AIVw113Favyv859ItMgt9Q7cEwPV0RC9GVlCJFyYnZMPMzNMp45ZWs7l EteIych/yY0bSud2nEU= X-Received: by 10.98.110.65 with SMTP id j62mr3741000pfc.115.1500414276197; Tue, 18 Jul 2017 14:44:36 -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.44.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 14:44:35 -0700 (PDT) From: Rob Herring To: Benjamin Herrenschmidt Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH] macintosh: Convert to using %pOF instead of full_name Date: Tue, 18 Jul 2017 16:43:12 -0500 Message-Id: <20170718214339.7774-32-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: Benjamin Herrenschmidt Cc: linuxppc-dev@lists.ozlabs.org --- drivers/macintosh/macio_sysfs.c | 2 +- drivers/macintosh/rack-meter.c | 4 ++-- drivers/macintosh/smu.c | 8 ++++---- drivers/macintosh/via-cuda.c | 4 ++-- drivers/macintosh/windfarm_fcu_controls.c | 4 ++-- drivers/macintosh/windfarm_lm87_sensor.c | 4 ++-- drivers/macintosh/windfarm_smu_sat.c | 2 +- 7 files changed, 14 insertions(+), 14 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/drivers/macintosh/macio_sysfs.c b/drivers/macintosh/macio_sysfs.c index 2445274f7e4b..281f5345661e 100644 --- a/drivers/macintosh/macio_sysfs.c +++ b/drivers/macintosh/macio_sysfs.c @@ -52,7 +52,7 @@ static ssize_t devspec_show(struct device *dev, struct platform_device *ofdev; ofdev = to_platform_device(dev); - return sprintf(buf, "%s\n", ofdev->dev.of_node->full_name); + return sprintf(buf, "%pOF\n", ofdev->dev.of_node); } static DEVICE_ATTR_RO(modalias); static DEVICE_ATTR_RO(devspec); diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c index e199fd6c71ce..e9da80ceb7c8 100644 --- a/drivers/macintosh/rack-meter.c +++ b/drivers/macintosh/rack-meter.c @@ -431,8 +431,8 @@ static int rackmeter_probe(struct macio_dev* mdev, of_address_to_resource(i2s, 0, &ri2s) || of_address_to_resource(i2s, 1, &rdma)) { printk(KERN_ERR - "rackmeter: found match but lacks resources: %s", - mdev->ofdev.dev.of_node->full_name); + "rackmeter: found match but lacks resources: %pOF", + mdev->ofdev.dev.of_node); rc = -ENXIO; goto bail_free; } diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index 1ac66421877a..ea9bdc85a21d 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c @@ -589,14 +589,14 @@ static int smu_late_init(void) if (smu->db_node) { smu->db_irq = irq_of_parse_and_map(smu->db_node, 0); if (!smu->db_irq) - printk(KERN_ERR "smu: failed to map irq for node %s\n", - smu->db_node->full_name); + printk(KERN_ERR "smu: failed to map irq for node %pOF\n", + smu->db_node); } if (smu->msg_node) { smu->msg_irq = irq_of_parse_and_map(smu->msg_node, 0); if (!smu->msg_irq) - printk(KERN_ERR "smu: failed to map irq for node %s\n", - smu->msg_node->full_name); + printk(KERN_ERR "smu: failed to map irq for node %pOF\n", + smu->msg_node); } /* diff --git a/drivers/macintosh/via-cuda.c b/drivers/macintosh/via-cuda.c index c60415958dfe..147da4edd021 100644 --- a/drivers/macintosh/via-cuda.c +++ b/drivers/macintosh/via-cuda.c @@ -297,8 +297,8 @@ static int __init via_cuda_start(void) #else cuda_irq = irq_of_parse_and_map(vias, 0); if (!cuda_irq) { - printk(KERN_ERR "via-cuda: can't map interrupts for %s\n", - vias->full_name); + printk(KERN_ERR "via-cuda: can't map interrupts for %pOF\n", + vias); return -ENODEV; } #endif diff --git a/drivers/macintosh/windfarm_fcu_controls.c b/drivers/macintosh/windfarm_fcu_controls.c index 0226b796a21c..fab7a21e9577 100644 --- a/drivers/macintosh/windfarm_fcu_controls.c +++ b/drivers/macintosh/windfarm_fcu_controls.c @@ -470,8 +470,8 @@ static void wf_fcu_lookup_fans(struct wf_fcu_priv *pv) id = ((*reg) - 0x30) / 2; if (id > 7) { pr_warning("wf_fcu: Can't parse " - "fan ID in device-tree for %s\n", - np->full_name); + "fan ID in device-tree for %pOF\n", + np); break; } wf_fcu_add_fan(pv, name, type, id); diff --git a/drivers/macintosh/windfarm_lm87_sensor.c b/drivers/macintosh/windfarm_lm87_sensor.c index c071aab79dd1..913c4bfeef94 100644 --- a/drivers/macintosh/windfarm_lm87_sensor.c +++ b/drivers/macintosh/windfarm_lm87_sensor.c @@ -126,8 +126,8 @@ static int wf_lm87_probe(struct i2c_client *client, } } if (!name) { - pr_warning("wf_lm87: Unsupported sensor %s\n", - client->dev.of_node->full_name); + pr_warning("wf_lm87: Unsupported sensor %pOF\n", + client->dev.of_node); return -ENODEV; } diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c index ad6223e88340..e9c828bf171b 100644 --- a/drivers/macintosh/windfarm_smu_sat.c +++ b/drivers/macintosh/windfarm_smu_sat.c @@ -248,7 +248,7 @@ static int wf_sat_probe(struct i2c_client *client, core = loc[5] - '0'; if (chip > 1 || core > 1) { printk(KERN_ERR "wf_sat_create: don't understand " - "location %s for %s\n", loc, child->full_name); + "location %s for %pOF\n", loc, child); continue; } cpu = 2 * chip + core;