Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1690737 > unrolled thread

[PATCH] hwmon: Convert to using %pOF instead of full_name

Back to article view | Back to linux.kernel

Contents

  [PATCH] hwmon: Convert to using %pOF instead of full_name Rob Herring <robh@kernel.org> - 2017-07-19 00:00 +0200
    Re: [PATCH] hwmon: Convert to using %pOF instead of full_name Guenter Roeck <linux@roeck-us.net> - 2017-07-19 03:50 +0200

#1690737 — [PATCH] hwmon: Convert to using %pOF instead of full_name

Now that we have a custom printf format specifier, convert users of
full_name to use %pOF instead. This is preparation to remove storing
of the full path string for each node.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Dirk Eibach <eibach@gdsys.de>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-hwmon@vger.kernel.org
---
 drivers/hwmon/ads1015.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/hwmon/ads1015.c b/drivers/hwmon/ads1015.c
index 357b42607164..98c704d3366a 100644
--- a/drivers/hwmon/ads1015.c
+++ b/drivers/hwmon/ads1015.c
@@ -191,24 +191,23 @@ 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);
 				return -EINVAL;
 			}
 		}
@@ -217,8 +216,7 @@ 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);
 				return -EINVAL;
 			}
 		}
--
2.11.0

[toc] | [next] | [standalone]

#1690893

On 07/18/2017 02:43 PM, Rob Herring wrote:
> Now that we have a custom printf format specifier, convert users of
> full_name to use %pOF instead. This is preparation to remove storing
> of the full path string for each node.
> 
> Signed-off-by: Rob Herring <robh@kernel.org>
> Cc: Dirk Eibach <eibach@gdsys.de>
> Cc: Jean Delvare <jdelvare@suse.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: linux-hwmon@vger.kernel.org

Applied to hwmon-next.

Thanks,
Guenter

> ---
>   drivers/hwmon/ads1015.c | 14 ++++++--------
>   1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/hwmon/ads1015.c b/drivers/hwmon/ads1015.c
> index 357b42607164..98c704d3366a 100644
> --- a/drivers/hwmon/ads1015.c
> +++ b/drivers/hwmon/ads1015.c
> @@ -191,24 +191,23 @@ 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);
>   				return -EINVAL;
>   			}
>   		}
> @@ -217,8 +216,7 @@ 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);
>   				return -EINVAL;
>   			}
>   		}
> --
> 2.11.0
> 
> 

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web