staging: Convert to using %pOFn instead of device_node.name

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c
index b0be80f05767869b9947a64dabd657ea18a129c4..3f48f5ceb6ea97c184a06be1a025b444a6d8edbc 100644 (file)
--- 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 acde372c6795b309aa474e3238bf23e37a604750..163437e421c5e5c32a3682a916c912d70526fe4f 100644 (file)
--- 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 7ad0c41412057f72c29737f7f0819be2f39d57f8..9ffa8f77123524587706003442613cac66dfab0b 100644 (file)
--- 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;