From patchwork Tue Aug 28 01:52:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 145270 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp609852ljw; Mon, 27 Aug 2018 18:55:19 -0700 (PDT) X-Google-Smtp-Source: ANB0VdagHHnd5lgzOc0fN0b+az+vbCrm1+04nqDgP/KKpS/vwiETAVOA1d68p2LxnpZO6mkfG/w6 X-Received: by 2002:a63:ac54:: with SMTP id z20-v6mr13984640pgn.74.1535421319548; Mon, 27 Aug 2018 18:55:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535421319; cv=none; d=google.com; s=arc-20160816; b=lOR6sZoCXe6OcA61qH09eL6LlSpQ4u81JUIqikCU/Eu4IVzTtI8IqfcnSkWev2ntE+ +Kr90SkYoLg1HyqiPln5dLIN5t+2C5GIsZIXBIGXcVEPCsJ5FCO5m0XBrJ4pewRPIzqw 6URslJ66pA+Ap/yJRAYa8xCutMTtrCroTLm4hAouHEvbNUZ/s2hLsLHAMrJFVGHSLrfh q3JSjI3f2CoMEnODhOH5g7Bur16eJ+XX8iqLOd1BUzOTD/rKfBUN21JK2Nyq91a0VQgL LmmRwjUwJGfvmzRlp0hTOjlFjpTeg8DJj+Ih1mrM6Xi+lXOKFlsXWgPb9V+Em9TySFdO ZVLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=NZktRJlPfF/Z+FbZBVB7Rm97KZRfYNx+6jHhruSk10Y=; b=Sao1jUx3biSPvReioMebm11U7YgmxFI16kU5pWqJLseJC8Ogl+c25noVFDgpJydOyJ eM6qT9p38YdTvgP4/ChrdDpVBkyeO7j5rt0ISpauY6YHeJo04olv6PtyYMyHG2oahhZw b2ddM2r91aNpRU5c6gDNbOrPvE17DY70BEC/YuncvGqUhDMFcZdpvtI77RPmIgyYcgGi I6mLewKlGNAxS6Z83PHuhLFtb9vCam2ngxNK0yU/I0L/lh6+ySY7/vVenttfcqzP88Dz gOEjjKM+KHmrlOz2AcNaaRJYpT7ZbAxOrTj+bIGkOktEjuYxW5W9rXVIugP/3LpViJsU kGNw== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s9-v6si1013000pgn.286.2018.08.27.18.55.19; Mon, 27 Aug 2018 18:55:19 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728164AbeH1Foc (ORCPT + 32 others); Tue, 28 Aug 2018 01:44:32 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:41122 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728135AbeH1Fob (ORCPT ); Tue, 28 Aug 2018 01:44:31 -0400 Received: by mail-oi0-f67.google.com with SMTP id k12-v6so1555oiw.8; Mon, 27 Aug 2018 18:55:15 -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:in-reply-to :references; bh=NZktRJlPfF/Z+FbZBVB7Rm97KZRfYNx+6jHhruSk10Y=; b=DcbhxfOsyOVRVf2uGHWIxQfNGa8NQWkYoQcV//aI9NlqdJSzudyxDgIVUI7HSEFjHO IT4BwzIKdsLosBvjshR+5DaJYVcT4V2iHX5nww9H170QmQNOw1LgYmoNjgacZrY4+2ZH YdfoqDKQn9tfeGbEX3ZWT8oWhl2YPKCNgyIwAIhTdLmltSx6ebRjzjrfKH+QFfDNU5Lg 1g/Ial4yoZBQX6Cy7WVFHz+UMRhpfxZi5yuA0fNzwOOJL6TGyk2cS200VWXCDOl4TBd9 ysMl6+f/VArT6VV1Be5o3IxNbqEsRt2rZ/NpqdgikbY2vqDlzhzYmnvByZDBmAC0u8mo yWug== X-Gm-Message-State: APzg51CDFavmJIArZsc7/gWhrG/VLZOOUugf4pTDqVS7R5n7qAUBO4rz XnqBFZBeIFhchWWkH2bduFwJTjQ= X-Received: by 2002:aca:5905:: with SMTP id n5-v6mr1202898oib.232.1535421314964; Mon, 27 Aug 2018 18:55:14 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id n71-v6sm1652696oig.48.2018.08.27.18.55.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Aug 2018 18:55:14 -0700 (PDT) From: Rob Herring To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Jiri Slaby , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linux-serial@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH] tty: Convert to using %pOFn instead of device_node.name Date: Mon, 27 Aug 2018 20:52:47 -0500 Message-Id: <20180828015252.28511-46-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180828015252.28511-1-robh@kernel.org> References: <20180828015252.28511-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier. Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman Cc: linux-serial@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Rob Herring --- drivers/tty/ehv_bytechan.c | 12 ++++++------ drivers/tty/serial/cpm_uart/cpm_uart_core.c | 8 ++++---- drivers/tty/serial/pmac_zilog.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) -- 2.17.1 diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c index eea4049b5dcc..769e0a5d1dfc 100644 --- a/drivers/tty/ehv_bytechan.c +++ b/drivers/tty/ehv_bytechan.c @@ -128,8 +128,8 @@ static int find_console_handle(void) */ iprop = of_get_property(np, "hv-handle", NULL); if (!iprop) { - pr_err("ehv-bc: no 'hv-handle' property in %s node\n", - np->name); + pr_err("ehv-bc: no 'hv-handle' property in %pOFn node\n", + np); return 0; } stdout_bc = be32_to_cpu(*iprop); @@ -661,8 +661,8 @@ static int ehv_bc_tty_probe(struct platform_device *pdev) iprop = of_get_property(np, "hv-handle", NULL); if (!iprop) { - dev_err(&pdev->dev, "no 'hv-handle' property in %s node\n", - np->name); + dev_err(&pdev->dev, "no 'hv-handle' property in %pOFn node\n", + np); return -ENODEV; } @@ -682,8 +682,8 @@ static int ehv_bc_tty_probe(struct platform_device *pdev) bc->rx_irq = irq_of_parse_and_map(np, 0); bc->tx_irq = irq_of_parse_and_map(np, 1); if ((bc->rx_irq == NO_IRQ) || (bc->tx_irq == NO_IRQ)) { - dev_err(&pdev->dev, "no 'interrupts' property in %s node\n", - np->name); + dev_err(&pdev->dev, "no 'interrupts' property in %pOFn node\n", + np); ret = -ENODEV; goto error; } diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c index 24a5f05e769b..ea7204d75022 100644 --- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c @@ -1151,8 +1151,8 @@ static int cpm_uart_init_port(struct device_node *np, if (!pinfo->clk) { data = of_get_property(np, "fsl,cpm-brg", &len); if (!data || len != 4) { - printk(KERN_ERR "CPM UART %s has no/invalid " - "fsl,cpm-brg property.\n", np->name); + printk(KERN_ERR "CPM UART %pOFn has no/invalid " + "fsl,cpm-brg property.\n", np); return -EINVAL; } pinfo->brg = *data; @@ -1160,8 +1160,8 @@ static int cpm_uart_init_port(struct device_node *np, data = of_get_property(np, "fsl,cpm-command", &len); if (!data || len != 4) { - printk(KERN_ERR "CPM UART %s has no/invalid " - "fsl,cpm-command property.\n", np->name); + printk(KERN_ERR "CPM UART %pOFn has no/invalid " + "fsl,cpm-command property.\n", np); return -EINVAL; } pinfo->command = *data; diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c index 3d21790d961e..a4ec22d1f214 100644 --- a/drivers/tty/serial/pmac_zilog.c +++ b/drivers/tty/serial/pmac_zilog.c @@ -1566,9 +1566,9 @@ static int pmz_attach(struct macio_dev *mdev, const struct of_device_id *match) * to work around bugs in ancient Apple device-trees */ if (macio_request_resources(uap->dev, "pmac_zilog")) - printk(KERN_WARNING "%s: Failed to request resource" + printk(KERN_WARNING "%pOFn: Failed to request resource" ", port still active\n", - uap->node->name); + uap->node); else uap->flags |= PMACZILOG_FLAG_RSRC_REQUESTED;