]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
iio: Convert to using %pOFn instead of device_node.name
authorRob Herring <robh@kernel.org>
Tue, 28 Aug 2018 01:52:23 +0000 (20:52 -0500)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 2 Sep 2018 17:54:31 +0000 (18:54 +0100)
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>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/qcom-pm8xxx-xoadc.c
drivers/iio/adc/rcar-gyroadc.c
drivers/iio/frequency/adf4350.c

index b093ecddf1a8ae4fc53410ed57cbd59a2472d9b8..c30c002f1fef78d35a9fca18dee6a8cce3277e3f 100644 (file)
@@ -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;
        }
index dcb50172186f49ab62722997cc34a55bdb667a06..4e982b51bcda7bc4dc1a1cdad5e7b29507e7aac9 100644 (file)
@@ -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;
                        }
                }
index 6d768431d90e926f33e3c524e7af014e2b7ce26d..f4748ff243f74a209fad810d5765ad7da271942f 100644 (file)
@@ -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);