diff options
| author | Rob Herring <robh@kernel.org> | 2018-08-28 04:00:19 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-06 19:30:15 +0300 |
| commit | 3edc2fac969abcc8754f8364fc32c5ba4b2c881b (patch) | |
| tree | 539717a3ef074eac255fa9e32e4ddaaa43063f33 /drivers/of/device.c | |
| parent | 214dea147ffa244699a993aaf9fe418f737f121f (diff) | |
| download | linux-3edc2fac969abcc8754f8364fc32c5ba4b2c881b.tar.xz | |
of: Convert to using %pOFn instead of device_node.name
commit a613b26a50136ae90ab13943afe90bcbd34adb44 upstream.
In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.
Reviewed-by: Frank Rowand <frank.rowand@sony.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: netdev@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/of/device.c')
| -rw-r--r-- | drivers/of/device.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/of/device.c b/drivers/of/device.c index 40b9051a7fce..258742830e36 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -221,7 +221,8 @@ static ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len return -ENODEV; /* Name & Type */ - csize = snprintf(str, len, "of:N%sT%s", dev->of_node->name, + /* %p eats all alphanum characters, so %c must be used here */ + csize = snprintf(str, len, "of:N%pOFn%c%s", dev->of_node, 'T', dev->of_node->type); tsize = csize; len -= csize; @@ -300,7 +301,7 @@ void of_device_uevent(struct device *dev, struct kobj_uevent_env *env) if ((!dev) || (!dev->of_node)) return; - add_uevent_var(env, "OF_NAME=%s", dev->of_node->name); + add_uevent_var(env, "OF_NAME=%pOFn", dev->of_node); add_uevent_var(env, "OF_FULLNAME=%pOF", dev->of_node); if (dev->of_node->type && strcmp("<NULL>", dev->of_node->type) != 0) add_uevent_var(env, "OF_TYPE=%s", dev->of_node->type); |