Merge tag 'iio-for-4.14a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[linux-2.6-block.git] / drivers / iio / adc / ti-ads1015.c

diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
index 884b8e461b1755ddbcbfbb3611deaa3b4a4c8fb9..7972845b382399272bdde1856e7b3b0bd4577183 100644 (file)
--- a/drivers/iio/adc/ti-ads1015.c
+++ b/drivers/iio/adc/ti-ads1015.c
@@ -505,24 +505,24 @@ static int ads1015_get_channels_config_of(struct i2c_client *client)
                unsigned int data_rate = ADS1015_DEFAULT_DATA_RATE;
 
                if (of_property_read_u32(node, "reg", &pval)) {
-                       dev_err(&client->dev, "invalid reg on %s\n",
-                               node->full_name);
+                       dev_err(&client->dev, "invalid reg on %pOF\n",
+                               node);
                        continue;
                }
 
                channel = pval;
                if (channel >= ADS1015_CHANNELS) {
                        dev_err(&client->dev,
-                               "invalid channel index %d on %s\n",
-                               channel, node->full_name);
+                               "invalid channel index %d on %pOF\n",
+                               channel, node);
                        continue;
                }
 
                if (!of_property_read_u32(node, "ti,gain", &pval)) {
                        pga = pval;
                        if (pga > 6) {
-                               dev_err(&client->dev, "invalid gain on %s\n",
-                                       node->full_name);
+                               dev_err(&client->dev, "invalid gain on %pOF\n",
+                                       node);
                                of_node_put(node);
                                return -EINVAL;
                        }
@@ -532,8 +532,8 @@ static int ads1015_get_channels_config_of(struct i2c_client *client)
                        data_rate = pval;
                        if (data_rate > 7) {
                                dev_err(&client->dev,
-                                       "invalid data_rate on %s\n",
-                                       node->full_name);
+                                       "invalid data_rate on %pOF\n",
+                                       node);
                                of_node_put(node);
                                return -EINVAL;
                        }