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: 9850127 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9FFEC602C8 for ; Tue, 18 Jul 2017 22:51:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C92A285E7 for ; Tue, 18 Jul 2017 22:51:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 817AB285F2; Tue, 18 Jul 2017 22:51:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 09504285E7 for ; Tue, 18 Jul 2017 22:51:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=QoRF34TVGLxGDcm9X1m0qyJlPy0fUTFFLZHnGZtCAMw=; b=hEw Z2f3fe7qtZU97/QSjenM5VhlP/vmT/GHi2glFdjizGAf85SomWqCySzb83ZhPJc09t78BTsazIPk/ 3VpQgkGk22SzUmVAsyT1houxzrGXr0m7s5yMkkduj3AaTCx61ivG59pU8ggK1z7ldCnZn4ldUg3rp k2nwpoFiP8Akn93b/ih6cwubQGJDH3PY9JSMy8fnmSdZQ37bcdMtexr+3YjONRSDgVPW2qKtf6NMb sWC/rbOMqugt3xCVG6EJhCQ6xrwueMqSx1QqtpweOtKfgxDbtfVLof8rndqvguhlpqeMhn5XBqx24 FTMr1uljN6d7IrEzEwZIWFA44pQVBxQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dXbKZ-0007ie-Qi; Tue, 18 Jul 2017 22:51:03 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dXbJ1-0005Em-Nr for linux-arm-kernel@bombadil.infradead.org; Tue, 18 Jul 2017 22:49:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=mejrZUUboX4Cv2X8kKc1qwAgH0/qYm96RLkpreOK+hM=; b=Tum6Vy+8OibGunKFKaLaQjLds hC19l126AibDzO81F88wPoqvLHJ2yqJAz/msWdGwpGoimPxySalSQHVGUsCfacQAbFnlmW8wdqSj1 laycu+7AeuC18v3tzQO5n1Y6wQIn5755xEalfEYlo8iFwj86Q3sWToNmA7yO1sOwORFsEdOrEY5by 7qbS/MAv2AJH4jWz8zfSOkv5t7tW57I6JQGpXPk/eYpYw/wc4wkVu81qxjgZ3ehwFRdpdRTTXSZIy wymcU/BOznH3IVsBjlCSuO1fdh2thNgXfRw2YyV/iOba0YRYSuslaoKerNgSpf8LO5+orkqbCjZEI Y2l95x2mA==; Received: from mail-pg0-f68.google.com ([74.125.83.68]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dXaIS-00014o-IV for linux-arm-kernel@lists.infradead.org; Tue, 18 Jul 2017 21:44:49 +0000 Received: by mail-pg0-f68.google.com with SMTP id z1so4352483pgs.0 for ; Tue, 18 Jul 2017 14:44:26 -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=G0XSzrHW94JpZPRGwmMpwsppTNzxJ8mc64bbAzw1pqY+eR/Y4cw2UfAZfHx/UKVMpC EobpHEzIBHVUdMz8uJP9BL4tfqaXjBOYpLf0wNDtITl99ihBoQWsq4bbLJlyh7PPRIvN 20+GhYLz+sJxyzTShuNzcs/tBYFuAwAuKKhxHqMbbDY8i701vyNun+6Rwnv0zPxdo6EE Rx/Ah+kBXR4vGimIN7KHbEE4jImRbRQXBxDDvyw4L3c8qDnmhlLBLT56AnDVLyVJpTMd 60a60gZahGtlQi199TXg1KoTakL3ML3Y2qUvuzzkCdYnmrFEYyuqjRuKwkUjiqEKDZWc 7KxQ== X-Gm-Message-State: AIVw113q72bRuIfmqF1sUGMeXe8HmlnGJlyXZUP8GiEFa8r9sx5sULCh dA8FdIFOC3Yf+A== 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 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 X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Michael Ellerman , linux-kernel@vger.kernel.org, Chen-Yu Tsai , Paul Mackerras , linux-i2c@vger.kernel.org, Benjamin Herrenschmidt , Maxime Ripard , linuxppc-dev@lists.ozlabs.org, Peter Rosin , linux-arm-kernel@lists.infradead.org, Haavard Skinnemoen MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Maxime Ripard --- 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 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;