diff options
author | Rob Herring <robh@kernel.org> | 2017-07-18 17:43:26 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-07-19 06:56:01 -0400 |
commit | 7799167b7a14feb17c258fb33a02c61eb54f67d1 (patch) | |
tree | 55cbafc2cd514e4b3fff8c5605cc4311e80466aa | |
parent | 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff) |
regulator: 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>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/regulator/core.c | 4 | ||||
-rw-r--r-- | drivers/regulator/max1586.c | 2 | ||||
-rw-r--r-- | drivers/regulator/s5m8767.c | 4 | ||||
-rw-r--r-- | drivers/reset/reset-socfpga.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index e567fa54980b..d79ba9af9352 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
@@ -204,8 +204,8 @@ static struct device_node *of_get_regulator(struct device *dev, const char *supp | |||
204 | regnode = of_parse_phandle(dev->of_node, prop_name, 0); | 204 | regnode = of_parse_phandle(dev->of_node, prop_name, 0); |
205 | 205 | ||
206 | if (!regnode) { | 206 | if (!regnode) { |
207 | dev_dbg(dev, "Looking up %s property in node %s failed\n", | 207 | dev_dbg(dev, "Looking up %s property in node %pOF failed\n", |
208 | prop_name, dev->of_node->full_name); | 208 | prop_name, dev->of_node); |
209 | return NULL; | 209 | return NULL; |
210 | } | 210 | } |
211 | return regnode; | 211 | return regnode; |
diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c index 6779c2b53674..66bbaa999433 100644 --- a/drivers/regulator/max1586.c +++ b/drivers/regulator/max1586.c | |||
@@ -169,7 +169,7 @@ static int of_get_max1586_platform_data(struct device *dev, | |||
169 | 169 | ||
170 | if (of_property_read_u32(np, "v3-gain", | 170 | if (of_property_read_u32(np, "v3-gain", |
171 | &pdata->v3_gain) < 0) { | 171 | &pdata->v3_gain) < 0) { |
172 | dev_err(dev, "%s has no 'v3-gain' property\n", np->full_name); | 172 | dev_err(dev, "%pOF has no 'v3-gain' property\n", np); |
173 | return -EINVAL; | 173 | return -EINVAL; |
174 | } | 174 | } |
175 | 175 | ||
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c index 383cd7533721..4836947e1521 100644 --- a/drivers/regulator/s5m8767.c +++ b/drivers/regulator/s5m8767.c | |||
@@ -590,8 +590,8 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev, | |||
590 | if (of_property_read_u32(reg_np, "op_mode", | 590 | if (of_property_read_u32(reg_np, "op_mode", |
591 | &rmode->mode)) { | 591 | &rmode->mode)) { |
592 | dev_warn(iodev->dev, | 592 | dev_warn(iodev->dev, |
593 | "no op_mode property property at %s\n", | 593 | "no op_mode property property at %pOF\n", |
594 | reg_np->full_name); | 594 | reg_np); |
595 | 595 | ||
596 | rmode->mode = S5M8767_OPMODE_NORMAL_MODE; | 596 | rmode->mode = S5M8767_OPMODE_NORMAL_MODE; |
597 | } | 597 | } |
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c index 07224c019892..c60904ff40b8 100644 --- a/drivers/reset/reset-socfpga.c +++ b/drivers/reset/reset-socfpga.c | |||
@@ -109,8 +109,8 @@ static int socfpga_reset_probe(struct platform_device *pdev) | |||
109 | * Do not continue, when we encounter an old DT. | 109 | * Do not continue, when we encounter an old DT. |
110 | */ | 110 | */ |
111 | if (!of_find_property(pdev->dev.of_node, "#reset-cells", NULL)) { | 111 | if (!of_find_property(pdev->dev.of_node, "#reset-cells", NULL)) { |
112 | dev_err(&pdev->dev, "%s missing #reset-cells property\n", | 112 | dev_err(&pdev->dev, "%pOF missing #reset-cells property\n", |
113 | pdev->dev.of_node->full_name); | 113 | pdev->dev.of_node); |
114 | return -EINVAL; | 114 | return -EINVAL; |
115 | } | 115 | } |
116 | 116 | ||