Skip to content

Commit c86f985

Browse files
committed
memory: 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: Roger Quadros <[email protected]> Cc: Kukjin Kim <[email protected]> Cc: Jonathan Hunter <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Acked-by: Thierry Reding <[email protected]> Acked-by: Tony Lindgren <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Rob Herring <[email protected]>
1 parent 2ef790d commit c86f985

File tree

4 files changed

+18
-22
lines changed

4 files changed

+18
-22
lines changed

drivers/memory/omap-gpmc.c

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2145,8 +2145,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
21452145
gpmc_s.device_width = GPMC_DEVWIDTH_16BIT;
21462146
break;
21472147
default:
2148-
dev_err(&pdev->dev, "%s: invalid 'nand-bus-width'\n",
2149-
child->name);
2148+
dev_err(&pdev->dev, "%pOFn: invalid 'nand-bus-width'\n",
2149+
child);
21502150
ret = -EINVAL;
21512151
goto err;
21522152
}
@@ -2186,8 +2186,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
21862186

21872187
ret = gpmc_cs_set_timings(cs, &gpmc_t, &gpmc_s);
21882188
if (ret) {
2189-
dev_err(&pdev->dev, "failed to set gpmc timings for: %s\n",
2190-
child->name);
2189+
dev_err(&pdev->dev, "failed to set gpmc timings for: %pOFn\n",
2190+
child);
21912191
goto err_cs;
21922192
}
21932193

@@ -2215,7 +2215,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
22152215

22162216
err_child_fail:
22172217

2218-
dev_err(&pdev->dev, "failed to create gpmc child %s\n", child->name);
2218+
dev_err(&pdev->dev, "failed to create gpmc child %pOFn\n", child);
22192219
ret = -ENODEV;
22202220

22212221
err_cs:
@@ -2265,14 +2265,10 @@ static void gpmc_probe_dt_children(struct platform_device *pdev)
22652265
struct device_node *child;
22662266

22672267
for_each_available_child_of_node(pdev->dev.of_node, child) {
2268-
2269-
if (!child->name)
2270-
continue;
2271-
22722268
ret = gpmc_probe_generic_child(pdev, child);
22732269
if (ret) {
2274-
dev_err(&pdev->dev, "failed to probe DT child '%s': %d\n",
2275-
child->name, ret);
2270+
dev_err(&pdev->dev, "failed to probe DT child '%pOFn': %d\n",
2271+
child, ret);
22762272
}
22772273
}
22782274
}

drivers/memory/samsung/exynos-srom.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ static int exynos_srom_probe(struct platform_device *pdev)
139139
for_each_child_of_node(np, child) {
140140
if (exynos_srom_configure_bank(srom, child)) {
141141
dev_err(dev,
142-
"Could not decode bank configuration for %s\n",
143-
child->name);
142+
"Could not decode bank configuration for %pOFn\n",
143+
child);
144144
bad_bank_config = true;
145145
}
146146
}

drivers/memory/tegra/mc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ static int load_one_timing(struct tegra_mc *mc,
345345
err = of_property_read_u32(node, "clock-frequency", &tmp);
346346
if (err) {
347347
dev_err(mc->dev,
348-
"timing %s: failed to read rate\n", node->name);
348+
"timing %pOFn: failed to read rate\n", node);
349349
return err;
350350
}
351351

@@ -360,8 +360,8 @@ static int load_one_timing(struct tegra_mc *mc,
360360
mc->soc->num_emem_regs);
361361
if (err) {
362362
dev_err(mc->dev,
363-
"timing %s: failed to read EMEM configuration\n",
364-
node->name);
363+
"timing %pOFn: failed to read EMEM configuration\n",
364+
node);
365365
return err;
366366
}
367367

drivers/memory/tegra/tegra124-emc.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -888,8 +888,8 @@ static int load_one_timing_from_dt(struct tegra_emc *emc,
888888

889889
err = of_property_read_u32(node, "clock-frequency", &value);
890890
if (err) {
891-
dev_err(emc->dev, "timing %s: failed to read rate: %d\n",
892-
node->name, err);
891+
dev_err(emc->dev, "timing %pOFn: failed to read rate: %d\n",
892+
node, err);
893893
return err;
894894
}
895895

@@ -900,16 +900,16 @@ static int load_one_timing_from_dt(struct tegra_emc *emc,
900900
ARRAY_SIZE(timing->emc_burst_data));
901901
if (err) {
902902
dev_err(emc->dev,
903-
"timing %s: failed to read emc burst data: %d\n",
904-
node->name, err);
903+
"timing %pOFn: failed to read emc burst data: %d\n",
904+
node, err);
905905
return err;
906906
}
907907

908908
#define EMC_READ_PROP(prop, dtprop) { \
909909
err = of_property_read_u32(node, dtprop, &timing->prop); \
910910
if (err) { \
911-
dev_err(emc->dev, "timing %s: failed to read " #prop ": %d\n", \
912-
node->name, err); \
911+
dev_err(emc->dev, "timing %pOFn: failed to read " #prop ": %d\n", \
912+
node, err); \
913913
return err; \
914914
} \
915915
}

0 commit comments

Comments
 (0)