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] iio: 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: Jonathan Cameron <jic23@kernel.org>
    Cc: Hartmut Knaack <knaack.h@gmx.de>
    Cc: Lars-Peter Clausen <lars@metafoo.de>
    Cc: linux-iio@vger.kernel.org
    Signed-off-by: Rob Herring <robh@kernel.org>
    ---
    drivers/iio/adc/qcom-pm8xxx-xoadc.c | 4 ++--
    drivers/iio/adc/rcar-gyroadc.c | 12 ++++++------
    drivers/iio/frequency/adf4350.c | 2 +-
    3 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/drivers/iio/adc/qcom-pm8xxx-xoadc.c b/drivers/iio/adc/qcom-pm8xxx-xoadc.c
    index b093ecddf1a8..c30c002f1fef 100644
    --- a/drivers/iio/adc/qcom-pm8xxx-xoadc.c
    +++ b/drivers/iio/adc/qcom-pm8xxx-xoadc.c
    @@ -708,8 +708,8 @@ static int pm8xxx_of_xlate(struct iio_dev *indio_dev,
    * mux.
    */
    if (iiospec->args_count != 2) {
    - dev_err(&indio_dev->dev, "wrong number of arguments for %s need 2 got %d\n",
    - iiospec->np->name,
    + dev_err(&indio_dev->dev, "wrong number of arguments for %pOFn need 2 got %d\n",
    + iiospec->np,
    iiospec->args_count);
    return -EINVAL;
    }
    diff --git a/drivers/iio/adc/rcar-gyroadc.c b/drivers/iio/adc/rcar-gyroadc.c
    index dcb50172186f..4e982b51bcda 100644
    --- a/drivers/iio/adc/rcar-gyroadc.c
    +++ b/drivers/iio/adc/rcar-gyroadc.c
    @@ -343,8 +343,8 @@ static int rcar_gyroadc_parse_subdevs(struct iio_dev *indio_dev)
    for_each_child_of_node(np, child) {
    of_id = of_match_node(rcar_gyroadc_child_match, child);
    if (!of_id) {
    - dev_err(dev, "Ignoring unsupported ADC \"%s\".",
    - child->name);
    + dev_err(dev, "Ignoring unsupported ADC \"%pOFn\".",
    + child);
    continue;
    }

    @@ -381,16 +381,16 @@ static int rcar_gyroadc_parse_subdevs(struct iio_dev *indio_dev)
    ret = of_property_read_u32(child, "reg", &reg);
    if (ret) {
    dev_err(dev,
    - "Failed to get child reg property of ADC \"%s\".\n",
    - child->name);
    + "Failed to get child reg property of ADC \"%pOFn\".\n",
    + child);
    return ret;
    }

    /* Channel number is too high. */
    if (reg >= num_channels) {
    dev_err(dev,
    - "Only %i channels supported with %s, but reg = <%i>.\n",
    - num_channels, child->name, reg);
    + "Only %i channels supported with %pOFn, but reg = <%i>.\n",
    + num_channels, child, reg);
    return ret;
    }
    }
    diff --git a/drivers/iio/frequency/adf4350.c b/drivers/iio/frequency/adf4350.c
    index 6d768431d90e..f4748ff243f7 100644
    --- a/drivers/iio/frequency/adf4350.c
    +++ b/drivers/iio/frequency/adf4350.c
    @@ -388,7 +388,7 @@ static struct adf4350_platform_data *adf4350_parse_dt(struct device *dev)
    if (!pdata)
    return NULL;

    - strncpy(&pdata->name[0], np->name, SPI_NAME_SIZE - 1);
    + snprintf(&pdata->name[0], SPI_NAME_SIZE - 1, "%pOFn", np);

    tmp = 10000;
    of_property_read_u32(np, "adi,channel-spacing", &tmp);
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-08-28 03:58    [W:2.754 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site