lkml.org 
[lkml]   [2018]   [Aug]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2] staging: Convert to using %pOFn instead of device_node.name
    Date
    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
    \
     
     \ /
      Last update: 2018-08-28 17:45    [W:4.558 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site