From patchwork Tue Aug 28 01:52:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 145273 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp609914ljw; Mon, 27 Aug 2018 18:55:24 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdatu45NXlB7FSeprnWlL685LGKaFptg83oG8WrfoizjfH5XYo938u6CHeT1v0eDquF0rXDz X-Received: by 2002:a17:902:82c9:: with SMTP id u9-v6mr15363298plz.138.1535421324529; Mon, 27 Aug 2018 18:55:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535421324; cv=none; d=google.com; s=arc-20160816; b=fPwdr9ZlyTyzuyZ+ZwLRXrajqbbu+ejH1+psQBR4Nbs7+XRweaG/osZdewf5mos7pi B5fsuty9c6hzA7p8HC+xQyeaX/Hz6LKCG3MxJ3h7MJMWspH0cCDuiLep6972xc0sJfxe C0Rs5ZI36SgYo6zdXjEYSLnXk9jXvVeqlvW11baiJZizKPWUIgXy2kJFenP63Wf6AfUh uhdt4MZSEmEGlzDMoOF1pumhDzKMhukjO3VjJOFoiwvjaVppldXWIwGviCVaTQlmT6/W T3T1H09LRLh5QLXetlSgpiwz2O/urOUJRmk9ZaJXfSzDt0nxw3vm8ga+vddKEcP1GK1X hw3Q== 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=55lHpuNsCJJAxN4AHRFm8FDVcJW+iNwvqKUpkyhMS40=; b=0ZndIXIt28dYiZrBUSLEvlNg+aMp7eGghkzbJhfbUknvgY7Yim69VpKelcs87VJ5Y4 JJoRHLWVfOA/sk/J092RqVQO/Me2fJRj/ptPk8fcFi7K9Yv0QXERgJ8yAumZuEPIsInO m36p32z+5DhEEQDOs8HYV99NMAOQppJyxwbK9cDZzGKkKHtXF0dz9nnRrzVJBtCARr/v eUBT/KMFZ6unfovE1mab3gaaMO8xMpA6cqQkersU2a/r4i63yfRY+nMsj0qZyB1OOF9g 728OQtF4bIGEA4T8iPPSs64EU4awm/1SCIZ0ZAoDUO6SXKmLANpzuG+7sro4wdNO/Lx+ W43A== 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 f23-v6si774377pgv.383.2018.08.27.18.55.24; Mon, 27 Aug 2018 18:55:24 -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 S1728228AbeH1Foh (ORCPT + 32 others); Tue, 28 Aug 2018 01:44:37 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:33524 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727477AbeH1Fog (ORCPT ); Tue, 28 Aug 2018 01:44:36 -0400 Received: by mail-oi0-f65.google.com with SMTP id 8-v6so53786oip.0 for ; Mon, 27 Aug 2018 18:55:21 -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=55lHpuNsCJJAxN4AHRFm8FDVcJW+iNwvqKUpkyhMS40=; b=R0sRmln7zokyUd8BniVyqyr5qiWrQK6H/kao/Mx+YXxO1edcv34PsD+0ghVAetqVzf 9eA+vXnVBETZ6KjfCbAgHrgVLgM7BeWHLtuYSsSkZdQI7pnmCKheovl1Nnx4SWWGrLlm u43qyPy+54mPgdOhcHldwIPRRrcaVrSCbl1xCU/UIESR7cwbfYu64oD9uO+j7bJHVEeZ h6IZ47LfyyjcA4N8u0X5RWi0aYVq0iILnT4iXhbA1dwarTwHFS4kKOZGoHCgJBYtUFg+ KjGLU6TtJUrUTX97vfEUc2H5cu3OBCtUppkz+P8G2skwEpoU+uclcBW2WStIUMl3e0AZ xNMg== X-Gm-Message-State: APzg51AucHjRg9D7m8cU8HS7s2L8+Q0DhDugQaeUS1C89K24bfQvTRp+ pQoj5/PhlSltxpV8ZTbsYMwJmF0= X-Received: by 2002:aca:3003:: with SMTP id w3-v6mr360623oiw.231.1535421320495; Mon, 27 Aug 2018 18:55:20 -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.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Aug 2018 18:55:19 -0700 (PDT) From: Rob Herring To: linux-kernel@vger.kernel.org Cc: Timur Tabi , Nicolin Chen , Xiubo Li , Fabio Estevam , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Carlo Caione , Kevin Hilman , Olivier Moysan , Arnaud Pouliquen , Maxime Coquelin , Alexandre Torgue , alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org Subject: [PATCH] ASoC: Convert to using %pOFn instead of device_node.name Date: Mon, 27 Aug 2018 20:52:52 -0500 Message-Id: <20180828015252.28511-51-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: Timur Tabi Cc: Nicolin Chen Cc: Xiubo Li Cc: Fabio Estevam Cc: Liam Girdwood Cc: Mark Brown Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Carlo Caione Cc: Kevin Hilman Cc: Olivier Moysan Cc: Arnaud Pouliquen Cc: Maxime Coquelin Cc: Alexandre Torgue Cc: alsa-devel@alsa-project.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Signed-off-by: Rob Herring --- sound/soc/fsl/fsl_esai.c | 2 +- sound/soc/fsl/fsl_utils.c | 4 ++-- sound/soc/meson/axg-card.c | 2 +- sound/soc/stm/stm32_sai.c | 2 +- sound/soc/stm/stm32_sai_sub.c | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) -- 2.17.1 diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index c1d1d06783e5..57b484768a58 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -807,7 +807,7 @@ static int fsl_esai_probe(struct platform_device *pdev) return -ENOMEM; esai_priv->pdev = pdev; - strncpy(esai_priv->name, np->name, sizeof(esai_priv->name) - 1); + snprintf(esai_priv->name, sizeof(esai_priv->name), "%pOFn", np); /* Get the addresses and IRQ */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); diff --git a/sound/soc/fsl/fsl_utils.c b/sound/soc/fsl/fsl_utils.c index 7f0fa4b52223..9981668ab590 100644 --- a/sound/soc/fsl/fsl_utils.c +++ b/sound/soc/fsl/fsl_utils.c @@ -57,8 +57,8 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np, of_node_put(dma_channel_np); return ret; } - snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%s", - (unsigned long long) res.start, dma_channel_np->name); + snprintf((char *)dai->platform_name, DAI_NAME_SIZE, "%llx.%pOFn", + (unsigned long long) res.start, dma_channel_np); iprop = of_get_property(dma_channel_np, "cell-index", NULL); if (!iprop) { diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 2914ba0d965b..b76a5f4f1785 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -478,7 +478,7 @@ static int axg_card_set_be_link(struct snd_soc_card *card, ret = axg_card_set_link_name(card, link, "be"); if (ret) - dev_err(card->dev, "error setting %s link name\n", np->name); + dev_err(card->dev, "error setting %pOFn link name\n", np); return ret; } diff --git a/sound/soc/stm/stm32_sai.c b/sound/soc/stm/stm32_sai.c index f22654253c43..d597eba61992 100644 --- a/sound/soc/stm/stm32_sai.c +++ b/sound/soc/stm/stm32_sai.c @@ -104,7 +104,7 @@ static int stm32_sai_set_sync(struct stm32_sai_data *sai_client, if (!pdev) { dev_err(&sai_client->pdev->dev, - "Device not found for node %s\n", np_provider->name); + "Device not found for node %pOFn\n", np_provider); return -ENODEV; } diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index 06fba9650ac4..cad8c7888292 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -1124,16 +1124,16 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev, sai->sync = SAI_SYNC_NONE; if (args.np) { if (args.np == np) { - dev_err(&pdev->dev, "%s sync own reference\n", - np->name); + dev_err(&pdev->dev, "%pOFn sync own reference\n", + np); of_node_put(args.np); return -EINVAL; } sai->np_sync_provider = of_get_parent(args.np); if (!sai->np_sync_provider) { - dev_err(&pdev->dev, "%s parent node not found\n", - np->name); + dev_err(&pdev->dev, "%pOFn parent node not found\n", + np); of_node_put(args.np); return -ENODEV; }