From patchwork Tue Jul 18 21:43:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 108193 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp6479839qge; Tue, 18 Jul 2017 14:44:35 -0700 (PDT) X-Received: by 10.98.66.8 with SMTP id p8mr3805955pfa.4.1500414275073; Tue, 18 Jul 2017 14:44:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500414275; cv=none; d=google.com; s=arc-20160816; b=ZlNkmmULU0+Aj7WyNayR5SS+LQQGp0//uDNcx0riRFX4IqVzFPyMiFskkzoDE1a0BR OTPQbFDDtSi3Dgw72Y/88+uNeT1muNNRd+9qn8LxPuF51GRkMMWY5XGHXAYQM37keepi xsUV0SJNEj50BY4xiU3ibn+lTdNzYYYlYPmlENOiXsE5y7BXmMhsHjPE9ZBq2FTksJtD EM5Z5sPe+dFUCPWkGpRXgDXcpgS6hdmaes8VFhZ1AeBxIJNHPmzR+oLlTW5ZplCsspRP fwkz4lU9HeeU32JvEBo/zYnajupOm0dda0UOYnDYtFIEHb8G8nYMhyQb0OQtTNTDassG 1Sxg== 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=mejrZUUboX4Cv2X8kKc1qwAgH0/qYm96RLkpreOK+hM=; b=MfH3nXtD1F6HIIdKcKAfhQX3yPqwmJpyNQ5XiUdgLSQWyoz5VYdESU/I1EGA8LgKrh N91v0nuuwl9fP693U6K6PooeWy3qlWeX/A+l3LQT75Vf0F6N/vdmO3Q8gzHN2NrOXuVY ZkvXReARTl4f9vTzH2ZY+7bvX1OHPYyR1RVDz4MKZtgz/XpMLefOqhJkYDR/BdbnodVI 8hJ6gvuTcXArJ8cja6l9jBxSzS1oNEWIsXlC5TqA8l00QgEKF9T0by/xSXhGcpNsAfu/ hdIIBdo6XMHwvNPcf3+WqHeg8k0+YIHk4SrgDKYHrClFVIp0agLTu3ELe0YaUv6+CcTo Qi4g== 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 l27si2663590pgn.56.2017.07.18.14.44.34; Tue, 18 Jul 2017 14:44:35 -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 S1752784AbdGRVoc (ORCPT + 25 others); Tue, 18 Jul 2017 17:44:32 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:35076 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752713AbdGRVoZ (ORCPT ); Tue, 18 Jul 2017 17:44:25 -0400 Received: by mail-pg0-f68.google.com with SMTP id d193so4332044pgc.2; Tue, 18 Jul 2017 14:44:25 -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=mejrZUUboX4Cv2X8kKc1qwAgH0/qYm96RLkpreOK+hM=; b=K/ztOZejJFUPLYLrpfiK7y+mxPo6OU0T1afe8QKNScjB+c8/0o8rlxbF2TSJQmE65J qtU4lOfM2SxazvT6nA1c/hw/pMY+IUDgTWYkdHBHaybm7lD9eV8g9iBOc33GkWsFtXZ+ DS0//DrqRzepweR2VnkYqYipvW6ZWbIRg9cz2ZCoxlrdb4kgpIWe5xATFiPFIU7ZNXUo APQ3zyuLWJjH7vZDTh9xnJDrkgd+/3sWTfKNuErVGRg2s3qzdAxLTdpTT8Nxc6hCetXy tbdT7aWdo0SFK1Cac39y0L8kt1YbVvhe1r9/6C6QgvaOkbGqmo/AZ5iORBCCJkY+Uik1 7UOw== X-Gm-Message-State: AIVw112qdb7gHY29ftONAJXSB8aR4v6hXU6DXfyWnhPVhg476GFX6mqP J6vQSDdQQr+e2A== X-Received: by 10.101.69.203 with SMTP id m11mr3721903pgr.105.1500414265002; Tue, 18 Jul 2017 14:44:25 -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.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 14:44:24 -0700 (PDT) From: Rob Herring To: Wolfram Sang Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Haavard Skinnemoen , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Maxime Ripard , Chen-Yu Tsai , Peter Rosin , linux-i2c@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] i2c: Convert to using %pOF instead of full_name Date: Tue, 18 Jul 2017 16:43:06 -0500 Message-Id: <20170718214339.7774-26-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: Haavard Skinnemoen Cc: Wolfram Sang Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: Maxime Ripard Cc: Chen-Yu Tsai Cc: Peter Rosin Cc: linux-i2c@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-arm-kernel@lists.infradead.org --- drivers/i2c/busses/i2c-gpio.c | 4 ++-- drivers/i2c/busses/i2c-powermac.c | 10 ++++------ drivers/i2c/busses/i2c-sun6i-p2wi.c | 4 ++-- drivers/i2c/i2c-core-of.c | 24 +++++++++++------------- drivers/i2c/muxes/i2c-demux-pinctrl.c | 4 ++-- 5 files changed, 21 insertions(+), 25 deletions(-) -- 2.11.0 Acked-by: Maxime Ripard diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index 34cfc0ebdcb9..0ef8fcc6ac3a 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c @@ -98,8 +98,8 @@ static int of_i2c_gpio_get_pins(struct device_node *np, return -EPROBE_DEFER; if (!gpio_is_valid(*sda_pin) || !gpio_is_valid(*scl_pin)) { - pr_err("%s: invalid GPIO pins, sda=%d/scl=%d\n", - np->full_name, *sda_pin, *scl_pin); + pr_err("%pOF: invalid GPIO pins, sda=%d/scl=%d\n", + np, *sda_pin, *scl_pin); return -ENODEV; } diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c index b0d9dee14a7e..ef9c858fe1d4 100644 --- a/drivers/i2c/busses/i2c-powermac.c +++ b/drivers/i2c/busses/i2c-powermac.c @@ -234,7 +234,7 @@ static u32 i2c_powermac_get_addr(struct i2c_adapter *adap, else if (!strcmp(node->name, "deq")) return 0x34; - dev_warn(&adap->dev, "No i2c address for %s\n", node->full_name); + dev_warn(&adap->dev, "No i2c address for %pOF\n", node); return 0xffffffff; } @@ -315,8 +315,7 @@ static bool i2c_powermac_get_type(struct i2c_adapter *adap, } } - dev_err(&adap->dev, "i2c-powermac: modalias failure" - " on %s\n", node->full_name); + dev_err(&adap->dev, "i2c-powermac: modalias failure on %pOF\n", node); return false; } @@ -348,8 +347,7 @@ static void i2c_powermac_register_devices(struct i2c_adapter *adap, if (!pmac_i2c_match_adapter(node, adap)) continue; - dev_dbg(&adap->dev, "i2c-powermac: register %s\n", - node->full_name); + dev_dbg(&adap->dev, "i2c-powermac: register %pOF\n", node); /* * Keep track of some device existence to handle @@ -372,7 +370,7 @@ static void i2c_powermac_register_devices(struct i2c_adapter *adap, newdev = i2c_new_device(adap, &info); if (!newdev) { dev_err(&adap->dev, "i2c-powermac: Failure to register" - " %s\n", node->full_name); + " %pOF\n", node); of_node_put(node); /* We do not dispose of the interrupt mapping on * purpose. It's not necessary (interrupt cannot be diff --git a/drivers/i2c/busses/i2c-sun6i-p2wi.c b/drivers/i2c/busses/i2c-sun6i-p2wi.c index 7668e2e9b8fd..8a24464dc337 100644 --- a/drivers/i2c/busses/i2c-sun6i-p2wi.c +++ b/drivers/i2c/busses/i2c-sun6i-p2wi.c @@ -223,8 +223,8 @@ static int p2wi_probe(struct platform_device *pdev) if (childnp) { ret = of_property_read_u32(childnp, "reg", &slave_addr); if (ret) { - dev_err(dev, "invalid slave address on node %s\n", - childnp->full_name); + dev_err(dev, "invalid slave address on node %pOF\n", + childnp); return -EINVAL; } diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c index ccf82fdbcd8e..8d474bb1dc15 100644 --- a/drivers/i2c/i2c-core-of.c +++ b/drivers/i2c/i2c-core-of.c @@ -32,18 +32,17 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap, u32 addr; int len; - dev_dbg(&adap->dev, "of_i2c: register %s\n", node->full_name); + dev_dbg(&adap->dev, "of_i2c: register %pOF\n", node); if (of_modalias_node(node, info.type, sizeof(info.type)) < 0) { - dev_err(&adap->dev, "of_i2c: modalias failure on %s\n", - node->full_name); + dev_err(&adap->dev, "of_i2c: modalias failure on %pOF\n", + node); return ERR_PTR(-EINVAL); } addr_be = of_get_property(node, "reg", &len); if (!addr_be || (len < sizeof(*addr_be))) { - dev_err(&adap->dev, "of_i2c: invalid reg on %s\n", - node->full_name); + dev_err(&adap->dev, "of_i2c: invalid reg on %pOF\n", node); return ERR_PTR(-EINVAL); } @@ -59,8 +58,8 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap, } if (i2c_check_addr_validity(addr, info.flags)) { - dev_err(&adap->dev, "of_i2c: invalid addr=%x on %s\n", - addr, node->full_name); + dev_err(&adap->dev, "of_i2c: invalid addr=%x on %pOF\n", + addr, node); return ERR_PTR(-EINVAL); } @@ -76,8 +75,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap, result = i2c_new_device(adap, &info); if (result == NULL) { - dev_err(&adap->dev, "of_i2c: Failure registering %s\n", - node->full_name); + dev_err(&adap->dev, "of_i2c: Failure registering %pOF\n", node); of_node_put(node); return ERR_PTR(-EINVAL); } @@ -106,8 +104,8 @@ void of_i2c_register_devices(struct i2c_adapter *adap) client = of_i2c_register_device(adap, node); if (IS_ERR(client)) { dev_warn(&adap->dev, - "Failed to create I2C device for %s\n", - node->full_name); + "Failed to create I2C device for %pOF\n", + node); of_node_clear_flag(node, OF_POPULATED); } } @@ -243,8 +241,8 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action, put_device(&adap->dev); if (IS_ERR(client)) { - dev_err(&adap->dev, "failed to create client for '%s'\n", - rd->dn->full_name); + dev_err(&adap->dev, "failed to create client for '%pOF'\n", + rd->dn); of_node_clear_flag(rd->dn, OF_POPULATED); return notifier_from_errno(PTR_ERR(client)); } diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c index 3e6fe1760d82..33ce032cb701 100644 --- a/drivers/i2c/muxes/i2c-demux-pinctrl.c +++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c @@ -167,8 +167,8 @@ static ssize_t available_masters_show(struct device *dev, int count = 0, i; for (i = 0; i < priv->num_chan && count < PAGE_SIZE; i++) - count += scnprintf(buf + count, PAGE_SIZE - count, "%d:%s%c", - i, priv->chan[i].parent_np->full_name, + count += scnprintf(buf + count, PAGE_SIZE - count, "%d:%pOF%c", + i, priv->chan[i].parent_np, i == priv->num_chan - 1 ? '\n' : ' '); return count;