Commit 0debe4d0 authored by Rob Herring's avatar Rob Herring Committed by Guenter Roeck

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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 23d3f131
...@@ -852,7 +852,7 @@ static int aspeed_create_pwm_cooling(struct device *dev, ...@@ -852,7 +852,7 @@ static int aspeed_create_pwm_cooling(struct device *dev,
dev_err(dev, "Property 'cooling-levels' cannot be read.\n"); dev_err(dev, "Property 'cooling-levels' cannot be read.\n");
return ret; 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->tcdev = thermal_of_cooling_device_register(child,
cdev->name, cdev->name,
......
...@@ -603,8 +603,8 @@ static int create_device_attrs(struct platform_device *pdev) ...@@ -603,8 +603,8 @@ static int create_device_attrs(struct platform_device *pdev)
if (of_property_read_u32(np, "sensor-id", &sensor_id) && if (of_property_read_u32(np, "sensor-id", &sensor_id) &&
of_property_read_u32(np, "sensor-data", &sensor_id)) { of_property_read_u32(np, "sensor-data", &sensor_id)) {
dev_info(&pdev->dev, dev_info(&pdev->dev,
"'sensor-id' missing in the node '%s'\n", "'sensor-id' missing in the node '%pOFn'\n",
np->name); np);
continue; continue;
} }
......
...@@ -65,13 +65,9 @@ static int iio_hwmon_probe(struct platform_device *pdev) ...@@ -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; int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
enum iio_chan_type type; enum iio_chan_type type;
struct iio_channel *channels; struct iio_channel *channels;
const char *name = "iio_hwmon";
struct device *hwmon_dev; struct device *hwmon_dev;
char *sname; char *sname;
if (dev->of_node && dev->of_node->name)
name = dev->of_node->name;
channels = devm_iio_channel_get_all(dev); channels = devm_iio_channel_get_all(dev);
if (IS_ERR(channels)) { if (IS_ERR(channels)) {
if (PTR_ERR(channels) == -ENODEV) if (PTR_ERR(channels) == -ENODEV)
...@@ -141,7 +137,10 @@ static int iio_hwmon_probe(struct platform_device *pdev) ...@@ -141,7 +137,10 @@ static int iio_hwmon_probe(struct platform_device *pdev)
st->attr_group.attrs = st->attrs; st->attr_group.attrs = st->attrs;
st->groups[0] = &st->attr_group; 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) if (!sname)
return -ENOMEM; return -ENOMEM;
......
...@@ -861,7 +861,7 @@ static int npcm7xx_create_pwm_cooling(struct device *dev, ...@@ -861,7 +861,7 @@ static int npcm7xx_create_pwm_cooling(struct device *dev,
dev_err(dev, "Property 'cooling-levels' cannot be read.\n"); dev_err(dev, "Property 'cooling-levels' cannot be read.\n");
return ret; return ret;
} }
snprintf(cdev->name, THERMAL_NAME_LENGTH, "%s%d", child->name, snprintf(cdev->name, THERMAL_NAME_LENGTH, "%pOFn%d", child,
pwm_port); pwm_port);
cdev->tcdev = thermal_of_cooling_device_register(child, cdev->tcdev = thermal_of_cooling_device_register(child,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment