From patchwork Tue Jul 18 21:43:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 108211 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp6482113qge; Tue, 18 Jul 2017 14:47:09 -0700 (PDT) X-Received: by 10.98.219.130 with SMTP id f124mr3786693pfg.168.1500414429737; Tue, 18 Jul 2017 14:47:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500414429; cv=none; d=google.com; s=arc-20160816; b=PMyQt/ALYjcazOXNjgpEMLT6xKvDlti8O/gWiZbg/8+MmjfrQu2TfoVtdKUWp1iw/w RpQZCi7wEdY8/4ozPL4WP0fH2xMtKwSoa0lnDIFljQ1L3aq1ygfRuD8hJ2eHuY0XC7xM z2giCI4K5zIhGMOF9hKwGey32J/+YWe2EBKtF8wQcuoFdCvcPWJtKa4HL7scshz15Fvz wB0/0gX3zS2f/JCcr/225iwmWoXS1f7lXEAgcEFdo7e4zkVCCSw7G4lrsiPSVA+1lrNZ QHOc6kwSeRdqrX6iRtsXzdJqF6CtQOXYycB1Wp4iV0uw3P+QaSWvjUpfaaRp+mkX9eWS 28/w== 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=2uCJRn9EABRaty49zrIuvQPAnkQ5JRSNnE+yxzuxVss=; b=LDsPNunuRMF6K8WdEp9B2yJUhxVNTtdDwBxfrU2+D9RrhH6VqFffEskaViav9CdSqj K1O5LPZ/NZXEQPq0HvARAt+iy7mOSKEOghcGoFQ4U9y1KwVII1x9Ofe4nZYzivIs+AjN U3GVdeboIZGPXh/Kzi9xWtz6jcFD88uPeCCybIyMK2NPPfJCH/ZWi+Sdx/8DYD1/XRNV qkCNgoP8/kKMKAYeE/8ETOLasOXZp72WK1LGQwdboNTuBCX6fpgqaSbSQ0GpVf77Ub+m eQ6uqXhSG84bAshhYlVHlOQv7rk6iI+jPGZqGr4sNzxKI5MT1o8lJ5iu8GfkzrZAetqc /kMQ== 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 k1si2619557pgc.534.2017.07.18.14.47.08; Tue, 18 Jul 2017 14:47:09 -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 S1753231AbdGRVrF (ORCPT + 25 others); Tue, 18 Jul 2017 17:47:05 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:33377 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752987AbdGRVpM (ORCPT ); Tue, 18 Jul 2017 17:45:12 -0400 Received: by mail-pf0-f193.google.com with SMTP id e199so4073251pfh.0; Tue, 18 Jul 2017 14:45:11 -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=2uCJRn9EABRaty49zrIuvQPAnkQ5JRSNnE+yxzuxVss=; b=DMvrXqc4555x7Bw1pPs+EieH9/o4LVeVUe6PQ3tdAXm0fyvGqVYMZgqmT6nij+CkkL 5a390tGsDU87EfOxX+wRnOD0ulha52f6iM828RfqD5igVxuUST3nrOxsJxEAOBrDrKFs wYZwsy2THmCnqL8SFIAt2wVc7dkFxKHq8suyODN5C5SF9iNFD0Pl4qAWbDbU5jOHIDA1 2C69miBZuNdI2UCZHs+BfNbzrxMSKBZXrJxcDEYz7Xhm2P0/haZsdqM14+CwtwXxmFPb Gw8qE8xgY3WbM9sUIfSkzFSkCMhSXcofU2Jvme4M8l/C63PNDvjcdzacXUVXt0uDtn9s mbxw== X-Gm-Message-State: AIVw11143rS0SGr3NLYHTxq+EkvVKIv8qDkKF5HyG8s/KPpFcvCTHi1h lg821YVw2aZ6iQ== X-Received: by 10.84.149.197 with SMTP id a5mr3846856plh.3.1500414311158; Tue, 18 Jul 2017 14:45:11 -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.45.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 14:45:10 -0700 (PDT) From: Rob Herring To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Jiri Slaby , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , "David S. Miller" , linuxppc-dev@lists.ozlabs.org, linux-serial@vger.kernel.org, sparclinux@vger.kernel.org Subject: [PATCH] tty: Convert to using %pOF instead of full_name Date: Tue, 18 Jul 2017 16:43:34 -0500 Message-Id: <20170718214339.7774-54-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: Greg Kroah-Hartman Cc: Jiri Slaby Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: "David S. Miller" Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-serial@vger.kernel.org Cc: sparclinux@vger.kernel.org --- drivers/tty/ehv_bytechan.c | 2 +- drivers/tty/hvc/hvc_opal.c | 16 ++++++++-------- drivers/tty/hvc/hvc_vio.c | 6 +++--- drivers/tty/serdev/core.c | 2 +- drivers/tty/serial/mpc52xx_uart.c | 12 ++++++------ drivers/tty/serial/pmac_zilog.c | 4 ++-- drivers/tty/serial/sunsu.c | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) -- 2.11.0 Acked-by: David S. Miller diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c index 61fe8d6fd24e..a1c7125cb968 100644 --- a/drivers/tty/ehv_bytechan.c +++ b/drivers/tty/ehv_bytechan.c @@ -122,7 +122,7 @@ static int find_console_handle(void) stdout_irq = irq_of_parse_and_map(np, 0); if (stdout_irq == NO_IRQ) { - pr_err("ehv-bc: no 'interrupts' property in %s node\n", np->full_name); + pr_err("ehv-bc: no 'interrupts' property in %pOF node\n", np); return 0; } diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c index 510799311099..16331a90c1e8 100644 --- a/drivers/tty/hvc/hvc_opal.c +++ b/drivers/tty/hvc/hvc_opal.c @@ -179,8 +179,8 @@ static int hvc_opal_probe(struct platform_device *dev) proto = HV_PROTOCOL_HVSI; ops = &hvc_opal_hvsi_ops; } else { - pr_err("hvc_opal: Unknown protocol for %s\n", - dev->dev.of_node->full_name); + pr_err("hvc_opal: Unknown protocol for %pOF\n", + dev->dev.of_node); return -ENXIO; } @@ -204,14 +204,14 @@ static int hvc_opal_probe(struct platform_device *dev) /* Instanciate now to establish a mapping index==vtermno */ hvc_instantiate(termno, termno, ops); } else { - pr_err("hvc_opal: Device %s has duplicate terminal number #%d\n", - dev->dev.of_node->full_name, termno); + pr_err("hvc_opal: Device %pOF has duplicate terminal number #%d\n", + dev->dev.of_node, termno); return -ENXIO; } - pr_info("hvc%d: %s protocol on %s%s\n", termno, + pr_info("hvc%d: %s protocol on %pOF%s\n", termno, proto == HV_PROTOCOL_RAW ? "raw" : "hvsi", - dev->dev.of_node->full_name, + dev->dev.of_node, boot ? " (boot console)" : ""); irq = irq_of_parse_and_map(dev->dev.of_node, 0); @@ -222,8 +222,8 @@ static int hvc_opal_probe(struct platform_device *dev) } if (!irq) { - pr_err("hvc_opal: Unable to map interrupt for device %s\n", - dev->dev.of_node->full_name); + pr_err("hvc_opal: Unable to map interrupt for device %pOF\n", + dev->dev.of_node); return irq; } diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c index b05dc5086627..78b003be7f67 100644 --- a/drivers/tty/hvc/hvc_vio.c +++ b/drivers/tty/hvc/hvc_vio.c @@ -312,12 +312,12 @@ static int hvc_vio_probe(struct vio_dev *vdev, proto = HV_PROTOCOL_HVSI; ops = &hvterm_hvsi_ops; } else { - pr_err("hvc_vio: Unknown protocol for %s\n", vdev->dev.of_node->full_name); + pr_err("hvc_vio: Unknown protocol for %pOF\n", vdev->dev.of_node); return -ENXIO; } - pr_devel("hvc_vio_probe() device %s, using %s protocol\n", - vdev->dev.of_node->full_name, + pr_devel("hvc_vio_probe() device %pOF, using %s protocol\n", + vdev->dev.of_node, proto == HV_PROTOCOL_RAW ? "raw" : "hvsi"); /* Is it our boot one ? */ diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c index ae1aaa0075d1..c68fb3a8ea1c 100644 --- a/drivers/tty/serdev/core.c +++ b/drivers/tty/serdev/core.c @@ -363,7 +363,7 @@ static int of_serdev_register_devices(struct serdev_controller *ctrl) if (!of_get_property(node, "compatible", NULL)) continue; - dev_dbg(&ctrl->dev, "adding child %s\n", node->full_name); + dev_dbg(&ctrl->dev, "adding child %pOF\n", node); serdev = serdev_device_alloc(ctrl); if (!serdev) diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c index 3970d6a9aaca..4cacaadbd14b 100644 --- a/drivers/tty/serial/mpc52xx_uart.c +++ b/drivers/tty/serial/mpc52xx_uart.c @@ -1634,8 +1634,8 @@ mpc52xx_console_setup(struct console *co, char *options) return -EINVAL; } - pr_debug("Console on ttyPSC%x is %s\n", - co->index, mpc52xx_uart_nodes[co->index]->full_name); + pr_debug("Console on ttyPSC%x is %pOF\n", + co->index, mpc52xx_uart_nodes[co->index]); /* Fetch register locations */ ret = of_address_to_resource(np, 0, &res); @@ -1755,8 +1755,8 @@ static int mpc52xx_uart_of_probe(struct platform_device *op) break; if (idx >= MPC52xx_PSC_MAXNUM) return -EINVAL; - pr_debug("Found %s assigned to ttyPSC%x\n", - mpc52xx_uart_nodes[idx]->full_name, idx); + pr_debug("Found %pOF assigned to ttyPSC%x\n", + mpc52xx_uart_nodes[idx], idx); /* set the uart clock to the input clock of the psc, the different * prescalers are taken into account in the set_baudrate() methods @@ -1881,8 +1881,8 @@ mpc52xx_uart_of_enumerate(void) for (i = 0; i < MPC52xx_PSC_MAXNUM; i++) { if (mpc52xx_uart_nodes[i]) - pr_debug("%s assigned to ttyPSC%x\n", - mpc52xx_uart_nodes[i]->full_name, i); + pr_debug("%pOF assigned to ttyPSC%x\n", + mpc52xx_uart_nodes[i], i); } } diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c index 0da52947e59e..6ccdd018fb45 100644 --- a/drivers/tty/serial/pmac_zilog.c +++ b/drivers/tty/serial/pmac_zilog.c @@ -1671,8 +1671,8 @@ static int __init pmz_probe(void) if (!node_a && !node_b) { of_node_put(node_a); of_node_put(node_b); - printk(KERN_ERR "pmac_zilog: missing node %c for escc %s\n", - (!node_a) ? 'a' : 'b', node_p->full_name); + printk(KERN_ERR "pmac_zilog: missing node %c for escc %pOF\n", + (!node_a) ? 'a' : 'b', node_p); continue; } diff --git a/drivers/tty/serial/sunsu.c b/drivers/tty/serial/sunsu.c index 72df2e1b88af..5380407bb0be 100644 --- a/drivers/tty/serial/sunsu.c +++ b/drivers/tty/serial/sunsu.c @@ -1212,8 +1212,8 @@ static int sunsu_kbd_ms_init(struct uart_sunsu_port *up) if (up->port.type == PORT_UNKNOWN) return -ENODEV; - printk("%s: %s port at %llx, irq %u\n", - up->port.dev->of_node->full_name, + printk("%pOF: %s port at %llx, irq %u\n", + up->port.dev->of_node, (up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse", (unsigned long long) up->port.mapbase, up->port.irq);