hwmon: 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: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-hwmon@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/aspeed-pwm-tacho.c b/drivers/hwmon/aspeed-pwm-tacho.c
index 5e449eac788a1311ee1f3be0c6ba7f91c9415964..92de8139d398beeb6079e58ec382b253dc759cee 100644 (file)
--- a/drivers/hwmon/aspeed-pwm-tacho.c
+++ b/drivers/hwmon/aspeed-pwm-tacho.c
@@ -852,7 +852,7 @@ static int aspeed_create_pwm_cooling(struct device *dev,
                dev_err(dev, "Property 'cooling-levels' cannot be read.\n");
                return ret;
        }
-       snprintf(cdev->name, MAX_CDEV_NAME_LEN, "%s%d", child->name, pwm_port);
+       snprintf(cdev->name, MAX_CDEV_NAME_LEN, "%pOFn%d", child, pwm_port);
 
        cdev->tcdev = thermal_of_cooling_device_register(child,
                                                         cdev->name,

diff --git a/drivers/hwmon/ibmpowernv.c b/drivers/hwmon/ibmpowernv.c
index 83472808c8163275d3f95e136b8aa3eb0291ead2..4935897f152738b5cbfff87e4f759ccfb426beae 100644 (file)
--- a/drivers/hwmon/ibmpowernv.c
+++ b/drivers/hwmon/ibmpowernv.c
@@ -603,8 +603,8 @@ static int create_device_attrs(struct platform_device *pdev)
                if (of_property_read_u32(np, "sensor-id", &sensor_id) &&
                    of_property_read_u32(np, "sensor-data", &sensor_id)) {
                        dev_info(&pdev->dev,
-                                "'sensor-id' missing in the node '%s'\n",
-                                np->name);
+                                "'sensor-id' missing in the node '%pOFn'\n",
+                                np);
                        continue;
                }
 

diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
index 2f3f875c06ac174a973233bb607da7dec7086c57..7566991f1c04798b75e30389ac202a8917a1df6f 100644 (file)
--- a/drivers/hwmon/iio_hwmon.c
+++ b/drivers/hwmon/iio_hwmon.c
@@ -65,13 +65,9 @@ static int iio_hwmon_probe(struct platform_device *pdev)
        int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
        enum iio_chan_type type;
        struct iio_channel *channels;
-       const char *name = "iio_hwmon";
        struct device *hwmon_dev;
        char *sname;
 
-       if (dev->of_node && dev->of_node->name)
-               name = dev->of_node->name;
-
        channels = devm_iio_channel_get_all(dev);
        if (IS_ERR(channels)) {
                if (PTR_ERR(channels) == -ENODEV)
@@ -141,7 +137,10 @@ static int iio_hwmon_probe(struct platform_device *pdev)
        st->attr_group.attrs = st->attrs;
        st->groups[0] = &st->attr_group;
 
-       sname = devm_kstrdup(dev, name, GFP_KERNEL);
+       if (dev->of_node)
+               sname = devm_kasprintf(dev, GFP_KERNEL, "%pOFn", dev->of_node);
+       else
+               sname = devm_kstrdup(dev, "iio_hwmon", GFP_KERNEL);
        if (!sname)
                return -ENOMEM;
 

diff --git a/drivers/hwmon/npcm750-pwm-fan.c b/drivers/hwmon/npcm750-pwm-fan.c
index 8474d601aa63ce018bb51e1f1c51982e195d8edc..96634fd54e0bd4cd8b12321fb0916e7657c0b580 100644 (file)
--- a/drivers/hwmon/npcm750-pwm-fan.c
+++ b/drivers/hwmon/npcm750-pwm-fan.c
@@ -861,7 +861,7 @@ static int npcm7xx_create_pwm_cooling(struct device *dev,
                dev_err(dev, "Property 'cooling-levels' cannot be read.\n");
                return ret;
        }
-       snprintf(cdev->name, THERMAL_NAME_LENGTH, "%s%d", child->name,
+       snprintf(cdev->name, THERMAL_NAME_LENGTH, "%pOFn%d", child,
                 pwm_port);
 
        cdev->tcdev = thermal_of_cooling_device_register(child,