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] i2c: 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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Michael Ellerman <mpe@ellerman.id.au>
    Cc: Peter Rosin <peda@axentia.se>
    Cc: linux-i2c@vger.kernel.org
    Cc: linuxppc-dev@lists.ozlabs.org
    Signed-off-by: Rob Herring <robh@kernel.org>
    ---
    drivers/i2c/busses/i2c-powermac.c | 15 ++++++++-------
    drivers/i2c/muxes/i2c-mux-gpmux.c | 4 ++--
    2 files changed, 10 insertions(+), 9 deletions(-)

    diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
    index f2a2067525ef..b706fd136ca5 100644
    --- a/drivers/i2c/busses/i2c-powermac.c
    +++ b/drivers/i2c/busses/i2c-powermac.c
    @@ -390,7 +390,6 @@ static int i2c_powermac_probe(struct platform_device *dev)
    struct pmac_i2c_bus *bus = dev_get_platdata(&dev->dev);
    struct device_node *parent = NULL;
    struct i2c_adapter *adapter;
    - const char *basename;
    int rc;

    if (bus == NULL)
    @@ -407,23 +406,25 @@ static int i2c_powermac_probe(struct platform_device *dev)
    parent = of_get_parent(pmac_i2c_get_controller(bus));
    if (parent == NULL)
    return -EINVAL;
    - basename = parent->name;
    + snprintf(adapter->name, sizeof(adapter->name), "%pOFn %d",
    + parent,
    + pmac_i2c_get_channel(bus));
    + of_node_put(parent);
    break;
    case pmac_i2c_bus_pmu:
    - basename = "pmu";
    + snprintf(adapter->name, sizeof(adapter->name), "pmu %d",
    + pmac_i2c_get_channel(bus));
    break;
    case pmac_i2c_bus_smu:
    /* This is not what we used to do but I'm fixing drivers at
    * the same time as this change
    */
    - basename = "smu";
    + snprintf(adapter->name, sizeof(adapter->name), "smu %d",
    + pmac_i2c_get_channel(bus));
    break;
    default:
    return -EINVAL;
    }
    - snprintf(adapter->name, sizeof(adapter->name), "%s %d", basename,
    - pmac_i2c_get_channel(bus));
    - of_node_put(parent);

    platform_set_drvdata(dev, adapter);
    adapter->algo = &i2c_powermac_algorithm;
    diff --git a/drivers/i2c/muxes/i2c-mux-gpmux.c b/drivers/i2c/muxes/i2c-mux-gpmux.c
    index 92cf5f48afe6..f60b670deff7 100644
    --- a/drivers/i2c/muxes/i2c-mux-gpmux.c
    +++ b/drivers/i2c/muxes/i2c-mux-gpmux.c
    @@ -120,8 +120,8 @@ static int i2c_mux_probe(struct platform_device *pdev)

    ret = of_property_read_u32(child, "reg", &chan);
    if (ret < 0) {
    - dev_err(dev, "no reg property for node '%s'\n",
    - child->name);
    + dev_err(dev, "no reg property for node '%pOFn'\n",
    + child);
    goto err_children;
    }

    --
    2.17.1
    \
     
     \ /
      Last update: 2018-08-28 03:53    [W:3.230 / U:0.608 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site