linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rob Herring <robh@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Ian Arkver <ian.arkver.dev@gmail.com>,
	Steve Longerbeam <slongerbeam@gmail.com>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-media@vger.kernel.org, devel@driverdev.osuosl.org
Subject: [PATCH v2] staging: Convert to using %pOFn instead of device_node.name
Date: Tue, 28 Aug 2018 10:44:33 -0500	[thread overview]
Message-ID: <20180828154433.5693-7-robh@kernel.org> (raw)
In-Reply-To: <20180828154433.5693-1-robh@kernel.org>
In-Reply-To: <20180828015252.28511-44-robh@kernel.org>

In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.

Cc: Steve Longerbeam <slongerbeam@gmail.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-media@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Signed-off-by: Rob Herring <robh@kernel.org>
---
v2:
- fix conditional use of node name vs devname for imx

 drivers/staging/media/imx/imx-media-dev.c | 15 ++++++++++-----
 drivers/staging/media/imx/imx-media-of.c  |  4 ++--
 drivers/staging/mt7621-eth/mdio.c         |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c
index b0be80f05767..3f48f5ceb6ea 100644
--- a/drivers/staging/media/imx/imx-media-dev.c
+++ b/drivers/staging/media/imx/imx-media-dev.c
@@ -89,8 +89,12 @@ int imx_media_add_async_subdev(struct imx_media_dev *imxmd,

 	/* return -EEXIST if this asd already added */
 	if (find_async_subdev(imxmd, fwnode, devname)) {
-		dev_dbg(imxmd->md.dev, "%s: already added %s\n",
-			__func__, np ? np->name : devname);
+		if (np)
+			dev_dbg(imxmd->md.dev, "%s: already added %pOFn\n",
+			__func__, np);
+		else
+			dev_dbg(imxmd->md.dev, "%s: already added %s\n",
+			__func__, devname);
 		ret = -EEXIST;
 		goto out;
 	}
@@ -105,19 +109,20 @@ int imx_media_add_async_subdev(struct imx_media_dev *imxmd,
 	if (fwnode) {
 		asd->match_type = V4L2_ASYNC_MATCH_FWNODE;
 		asd->match.fwnode = fwnode;
+		dev_dbg(imxmd->md.dev, "%s: added %pOFn, match type FWNODE\n",
+			__func__, np);
 	} else {
 		asd->match_type = V4L2_ASYNC_MATCH_DEVNAME;
 		asd->match.device_name = devname;
 		imxasd->pdev = pdev;
+		dev_dbg(imxmd->md.dev, "%s: added %s, match type DEVNAME\n",
+			__func__, devname);
 	}

 	list_add_tail(&imxasd->list, &imxmd->asd_list);

 	imxmd->subdev_notifier.num_subdevs++;

-	dev_dbg(imxmd->md.dev, "%s: added %s, match type %s\n",
-		__func__, np ? np->name : devname, np ? "FWNODE" : "DEVNAME");
-
 out:
 	mutex_unlock(&imxmd->mutex);
 	return ret;
diff --git a/drivers/staging/media/imx/imx-media-of.c b/drivers/staging/media/imx/imx-media-of.c
index acde372c6795..163437e421c5 100644
--- a/drivers/staging/media/imx/imx-media-of.c
+++ b/drivers/staging/media/imx/imx-media-of.c
@@ -79,8 +79,8 @@ of_parse_subdev(struct imx_media_dev *imxmd, struct device_node *sd_np,
 	int i, num_ports, ret;

 	if (!of_device_is_available(sd_np)) {
-		dev_dbg(imxmd->md.dev, "%s: %s not enabled\n", __func__,
-			sd_np->name);
+		dev_dbg(imxmd->md.dev, "%s: %pOFn not enabled\n", __func__,
+			sd_np);
 		/* unavailable is not an error */
 		return 0;
 	}
diff --git a/drivers/staging/mt7621-eth/mdio.c b/drivers/staging/mt7621-eth/mdio.c
index 7ad0c4141205..9ffa8f771235 100644
--- a/drivers/staging/mt7621-eth/mdio.c
+++ b/drivers/staging/mt7621-eth/mdio.c
@@ -70,7 +70,7 @@ int mtk_connect_phy_node(struct mtk_eth *eth, struct mtk_mac *mac,
 	_port = of_get_property(phy_node, "reg", NULL);

 	if (!_port || (be32_to_cpu(*_port) >= 0x20)) {
-		pr_err("%s: invalid port id\n", phy_node->name);
+		pr_err("%pOFn: invalid port id\n", phy_node);
 		return -EINVAL;
 	}
 	port = be32_to_cpu(*_port);
@@ -249,7 +249,7 @@ int mtk_mdio_init(struct mtk_eth *eth)
 	eth->mii_bus->priv = eth;
 	eth->mii_bus->parent = eth->dev;

-	snprintf(eth->mii_bus->id, MII_BUS_ID_SIZE, "%s", mii_np->name);
+	snprintf(eth->mii_bus->id, MII_BUS_ID_SIZE, "%pOFn", mii_np);
 	err = of_mdiobus_register(eth->mii_bus, mii_np);
 	if (err)
 		goto err_free_bus;
--
2.17.1

  parent reply	other threads:[~2018-08-28 15:44 UTC|newest]

Thread overview: 163+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-28  1:52 [PATCH] ARM: omap: Convert to using %pOFn instead of device_node.name Rob Herring
2018-08-28  1:52 ` [PATCH] ARM: shmobile: " Rob Herring
2018-08-28  7:24   ` Geert Uytterhoeven
2018-08-30 14:37     ` Simon Horman
2018-08-28  1:52 ` [PATCH] ARM: zynq: " Rob Herring
2018-09-05 13:27   ` Michal Simek
2018-08-28  1:52 ` [PATCH] MIPS: " Rob Herring
2018-08-28 16:54   ` Paul Burton
2018-08-28  1:52 ` [PATCH] nios2: " Rob Herring
2018-08-28 15:47   ` Ley Foon Tan
2018-08-28  1:52 ` [PATCH] powerpc: " Rob Herring
2018-10-04  6:14   ` Michael Ellerman
2018-08-28  1:52 ` [PATCH] sparc: " Rob Herring
2018-08-28 14:13   ` Rob Herring
2018-08-28 15:44   ` [PATCH v2] " Rob Herring
2018-10-08  5:57     ` David Miller
2018-08-28  1:52 ` [PATCH] xtensa: " Rob Herring
2018-08-28 15:45   ` Max Filippov
2018-08-28  1:52 ` [PATCH] ata: ahci: " Rob Herring
2018-08-28 14:44   ` Jens Axboe
2018-08-28  1:52 ` [PATCH] bus: fsl-mc: " Rob Herring
2018-08-28  1:52 ` [PATCH] bus: mvebu-mbus: " Rob Herring
2018-08-28  1:52 ` [PATCH] clk: " Rob Herring
2018-08-28 15:44   ` [PATCH v2] " Rob Herring
2018-08-28 22:15     ` Stephen Boyd
2018-08-29 11:13       ` Rob Herring
2018-08-30 16:50         ` Stephen Boyd
2018-09-03  5:29   ` [PATCH] " Chen-Yu Tsai
2018-09-07 15:08   ` Rob Herring
2018-08-28  1:52 ` [PATCH] clocksource: " Rob Herring
2018-08-29 15:23   ` Daniel Lezcano
2018-08-28  1:52 ` [PATCH] cpufreq: " Rob Herring
2018-09-03  6:34   ` Viresh Kumar
2018-09-14  8:27   ` Rafael J. Wysocki
2018-08-28  1:52 ` [PATCH] devfreq: " Rob Herring
2018-08-28  2:06   ` Chanwoo Choi
     [not found]   ` <CGME20180828015312epcas2p2fdb2ee1d1b292f212ec773dd8fb4bfc7@epcms1p8>
2018-08-29  2:10     ` MyungJoo Ham
2018-08-28  1:52 ` [PATCH] dmaengine: " Rob Herring
2018-08-28  5:16   ` Vinod
2018-08-28  1:52 ` [PATCH] firmware: " Rob Herring
2018-09-28 21:47   ` Rob Herring
2018-10-01  9:09     ` Sudeep Holla
2018-08-28  1:52 ` [PATCH] gpio: " Rob Herring
2018-08-29 12:02   ` Linus Walleij
2018-08-28  1:52 ` [PATCH] drm: " Rob Herring
2018-08-28 12:54   ` Maarten Lankhorst
2018-08-28 15:04     ` Rob Herring
2018-08-28 15:04   ` Rob Clark
2018-08-28  1:52 ` [PATCH] hwmon: " Rob Herring
2018-08-28 13:57   ` Guenter Roeck
2018-08-28 15:11     ` Rob Herring
2018-08-28 18:43   ` Guenter Roeck
2018-08-28  1:52 ` [PATCH] i2c: " Rob Herring
2018-08-28  6:33   ` Peter Rosin
2018-08-29 18:42     ` Rob Herring
2018-08-29 19:52       ` Peter Rosin
2018-08-30  0:49         ` Rob Herring
2018-08-28  1:52 ` [PATCH] iio: " Rob Herring
2018-09-02 17:55   ` Jonathan Cameron
2018-08-28  1:52 ` [PATCH] input: sun4i-lradc: " Rob Herring
2018-09-28 21:54   ` Rob Herring
2018-09-28 23:59   ` Dmitry Torokhov
2018-08-28  1:52 ` [PATCH] irqchip: " Rob Herring
2018-09-08 12:15   ` Thomas Gleixner
2018-09-10 13:55     ` Rob Herring
2018-08-28  1:52 ` [PATCH] leds: " Rob Herring
2018-08-28 11:07   ` Sakari Ailus
2018-08-28 11:37   ` Pavel Machek
2018-08-28 20:37   ` Jacek Anaszewski
2018-08-28  1:52 ` [PATCH] macintosh: " Rob Herring
2018-08-28  1:52 ` [PATCH] mailbox: " Rob Herring
2018-09-28 21:54   ` Rob Herring
2018-08-28  1:52 ` [PATCH] media: " Rob Herring
2018-08-28 10:06   ` Laurent Pinchart
2018-08-28 12:21     ` Rob Herring
2018-09-12 15:10       ` Mauro Carvalho Chehab
2018-08-28  1:52 ` [PATCH] memory: " Rob Herring
2018-08-28 10:42   ` Thierry Reding
2018-08-28 15:33   ` Tony Lindgren
2018-08-29  7:44   ` Krzysztof Kozlowski
2018-08-28  1:52 ` [PATCH] mfd: max77620: " Rob Herring
2018-09-10 15:24   ` Lee Jones
2018-08-28  1:52 ` [PATCH] misc: " Rob Herring
2018-08-28  2:35   ` Andrew Donnellan
2018-08-28  1:52 ` [PATCH] mmc: " Rob Herring
2018-08-28  7:59   ` Adrian Hunter
2018-08-28 11:41   ` Ulf Hansson
2018-08-28  1:52 ` [PATCH] mtd: rawnand: " Rob Herring
2018-08-28  9:16   ` Boris Brezillon
2018-09-04 21:58   ` Miquel Raynal
2018-08-28  1:52 ` [PATCH] net: ethernet: " Rob Herring
2018-08-28 15:44   ` [PATCH v2] " Rob Herring
2018-08-28 15:45     ` Matthias Brugger
2018-08-29  2:06     ` Sean Wang
2018-08-30  2:41     ` David Miller
2018-08-28  1:52 ` [PATCH] net: phy: " Rob Herring
2018-08-28 16:57   ` Florian Fainelli
2018-08-28  1:52 ` [PATCH] net: wireless: ath: " Rob Herring
2018-08-28 11:19   ` Kalle Valo
2018-09-03 16:58   ` Kalle Valo
2018-08-28  1:52 ` [PATCH] nvmem: " Rob Herring
2018-09-28 22:06   ` Rob Herring
2018-10-01  9:05     ` Srinivas Kandagatla
2018-08-28  1:52 ` [PATCH] perf: " Rob Herring
2018-08-28 17:02   ` Will Deacon
2018-09-28 21:19     ` Rob Herring
2018-10-01  9:18       ` Will Deacon
2018-08-28  1:52 ` [PATCH] phy: " Rob Herring
2018-09-04  2:24   ` Kishon Vijay Abraham I
2018-09-04 14:21     ` Rob Herring
2018-08-28  1:52 ` [PATCH] pinctrl: " Rob Herring
2018-08-28  1:57   ` A.s. Dong
2018-08-28  7:21   ` Alexandre Belloni
2018-08-28 15:34   ` Tony Lindgren
2018-08-29  2:13   ` Sean Wang
2018-08-29  2:15   ` Chen-Yu Tsai
2018-08-29  8:31   ` Heiko Stübner
2018-08-29 12:07   ` Linus Walleij
2018-09-03  9:57   ` Patrice CHOTARD
2018-08-28  1:52 ` [PATCH] regulator: " Rob Herring
2018-08-29  7:47   ` Krzysztof Kozlowski
2018-08-28  1:52 ` [PATCH] rpmsg: " Rob Herring
2018-08-28  3:08   ` Bjorn Andersson
2018-08-28  1:52 ` [PATCH] soc: " Rob Herring
2018-08-28 10:44   ` Thierry Reding
2018-08-28 18:48   ` Li Yang
2018-08-28 22:14     ` Tyrel Datwyler
2018-08-28 22:29       ` Li Yang
2018-08-28 22:46         ` Tyrel Datwyler
2018-08-29  8:21   ` Heiko Stübner
2018-08-29  8:57   ` Qiang Zhao
2018-09-30 17:08   ` Andy Gross
2018-08-28  1:52 ` [PATCH] staging: " Rob Herring
2018-08-28  6:34   ` Ian Arkver
2018-08-28 15:44   ` Rob Herring [this message]
2018-09-12 15:17     ` [PATCH v2] " Mauro Carvalho Chehab
2018-09-12 20:26       ` Rob Herring
2018-09-12 21:07         ` Mauro Carvalho Chehab
2018-09-12 22:48           ` Rob Herring
2018-09-13 11:50         ` Joe Perches
2018-09-13 21:26           ` Rob Herring
2018-09-14 11:41             ` Joe Perches
2018-08-28  1:52 ` [PATCH] thermal: " Rob Herring
2018-08-30 14:58   ` Daniel Lezcano
2018-08-28  1:52 ` [PATCH] tty: " Rob Herring
2018-09-28 22:09   ` Rob Herring
2018-09-28 22:32     ` Rob Herring
2018-08-28  1:52 ` [PATCH] uio: " Rob Herring
2018-08-28  1:52 ` [PATCH] backlight: pm8941: " Rob Herring
2018-08-28  1:52 ` [PATCH] fbdev: " Rob Herring
2018-09-28 22:11   ` Rob Herring
2018-10-08 10:41   ` Bartlomiej Zolnierkiewicz
2018-08-28  1:52 ` [PATCH] sound: " Rob Herring
2018-08-28  7:54   ` Andy Shevchenko
2018-08-28 15:44   ` [PATCH v2] " Rob Herring
2018-09-03 21:45     ` [alsa-devel] " Takashi Iwai
2018-08-28  1:52 ` [PATCH] ASoC: " Rob Herring
2018-08-28  7:57   ` Andy Shevchenko
2018-08-28 15:44   ` [PATCH v2] " Rob Herring
2018-08-28 18:03     ` Mark Brown
2018-08-28  6:55 ` [PATCH] ARM: omap: " Joe Perches
2018-08-28 15:44 ` [PATCH v2] " Rob Herring
2018-09-07 17:14   ` Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180828154433.5693-7-robh@kernel.org \
    --to=robh@kernel.org \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=ian.arkver.dev@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=p.zabel@pengutronix.de \
    --cc=slongerbeam@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).