diff options
author | Rob Herring <robh@kernel.org> | 2018-08-27 20:57:23 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2018-11-27 11:54:39 -0500 |
commit | c86f98544f234e64bb53558545782c24e78d5c49 (patch) | |
tree | ef26a4ceea917b30fb0046f0eff37c79d9b45136 /drivers/memory | |
parent | 2ef790dc443a25cc3818b0fa34cb9f4ed0ec5ec1 (diff) |
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 <rogerq@ti.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-tegra@vger.kernel.org
Acked-by: Thierry Reding <treding@nvidia.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/memory')
-rw-r--r-- | drivers/memory/omap-gpmc.c | 18 | ||||
-rw-r--r-- | drivers/memory/samsung/exynos-srom.c | 4 | ||||
-rw-r--r-- | drivers/memory/tegra/mc.c | 6 | ||||
-rw-r--r-- | drivers/memory/tegra/tegra124-emc.c | 12 |
4 files changed, 18 insertions, 22 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index c215287e80cf..8abb9e94916a 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c | |||
@@ -2145,8 +2145,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, | |||
2145 | gpmc_s.device_width = GPMC_DEVWIDTH_16BIT; | 2145 | gpmc_s.device_width = GPMC_DEVWIDTH_16BIT; |
2146 | break; | 2146 | break; |
2147 | default: | 2147 | default: |
2148 | dev_err(&pdev->dev, "%s: invalid 'nand-bus-width'\n", | 2148 | dev_err(&pdev->dev, "%pOFn: invalid 'nand-bus-width'\n", |
2149 | child->name); | 2149 | child); |
2150 | ret = -EINVAL; | 2150 | ret = -EINVAL; |
2151 | goto err; | 2151 | goto err; |
2152 | } | 2152 | } |
@@ -2186,8 +2186,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, | |||
2186 | 2186 | ||
2187 | ret = gpmc_cs_set_timings(cs, &gpmc_t, &gpmc_s); | 2187 | ret = gpmc_cs_set_timings(cs, &gpmc_t, &gpmc_s); |
2188 | if (ret) { | 2188 | if (ret) { |
2189 | dev_err(&pdev->dev, "failed to set gpmc timings for: %s\n", | 2189 | dev_err(&pdev->dev, "failed to set gpmc timings for: %pOFn\n", |
2190 | child->name); | 2190 | child); |
2191 | goto err_cs; | 2191 | goto err_cs; |
2192 | } | 2192 | } |
2193 | 2193 | ||
@@ -2215,7 +2215,7 @@ no_timings: | |||
2215 | 2215 | ||
2216 | err_child_fail: | 2216 | err_child_fail: |
2217 | 2217 | ||
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); |
2219 | ret = -ENODEV; | 2219 | ret = -ENODEV; |
2220 | 2220 | ||
2221 | err_cs: | 2221 | err_cs: |
@@ -2265,14 +2265,10 @@ static void gpmc_probe_dt_children(struct platform_device *pdev) | |||
2265 | struct device_node *child; | 2265 | struct device_node *child; |
2266 | 2266 | ||
2267 | for_each_available_child_of_node(pdev->dev.of_node, child) { | 2267 | for_each_available_child_of_node(pdev->dev.of_node, child) { |
2268 | |||
2269 | if (!child->name) | ||
2270 | continue; | ||
2271 | |||
2272 | ret = gpmc_probe_generic_child(pdev, child); | 2268 | ret = gpmc_probe_generic_child(pdev, child); |
2273 | if (ret) { | 2269 | if (ret) { |
2274 | dev_err(&pdev->dev, "failed to probe DT child '%s': %d\n", | 2270 | dev_err(&pdev->dev, "failed to probe DT child '%pOFn': %d\n", |
2275 | child->name, ret); | 2271 | child, ret); |
2276 | } | 2272 | } |
2277 | } | 2273 | } |
2278 | } | 2274 | } |
diff --git a/drivers/memory/samsung/exynos-srom.c b/drivers/memory/samsung/exynos-srom.c index 7edd7fb540f2..c27c6105c66d 100644 --- a/drivers/memory/samsung/exynos-srom.c +++ b/drivers/memory/samsung/exynos-srom.c | |||
@@ -139,8 +139,8 @@ static int exynos_srom_probe(struct platform_device *pdev) | |||
139 | for_each_child_of_node(np, child) { | 139 | for_each_child_of_node(np, child) { |
140 | if (exynos_srom_configure_bank(srom, child)) { | 140 | if (exynos_srom_configure_bank(srom, child)) { |
141 | dev_err(dev, | 141 | dev_err(dev, |
142 | "Could not decode bank configuration for %s\n", | 142 | "Could not decode bank configuration for %pOFn\n", |
143 | child->name); | 143 | child); |
144 | bad_bank_config = true; | 144 | bad_bank_config = true; |
145 | } | 145 | } |
146 | } | 146 | } |
diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c index bd25faf6d13d..24afc36833bf 100644 --- a/drivers/memory/tegra/mc.c +++ b/drivers/memory/tegra/mc.c | |||
@@ -345,7 +345,7 @@ static int load_one_timing(struct tegra_mc *mc, | |||
345 | err = of_property_read_u32(node, "clock-frequency", &tmp); | 345 | err = of_property_read_u32(node, "clock-frequency", &tmp); |
346 | if (err) { | 346 | if (err) { |
347 | dev_err(mc->dev, | 347 | dev_err(mc->dev, |
348 | "timing %s: failed to read rate\n", node->name); | 348 | "timing %pOFn: failed to read rate\n", node); |
349 | return err; | 349 | return err; |
350 | } | 350 | } |
351 | 351 | ||
@@ -360,8 +360,8 @@ static int load_one_timing(struct tegra_mc *mc, | |||
360 | mc->soc->num_emem_regs); | 360 | mc->soc->num_emem_regs); |
361 | if (err) { | 361 | if (err) { |
362 | dev_err(mc->dev, | 362 | dev_err(mc->dev, |
363 | "timing %s: failed to read EMEM configuration\n", | 363 | "timing %pOFn: failed to read EMEM configuration\n", |
364 | node->name); | 364 | node); |
365 | return err; | 365 | return err; |
366 | } | 366 | } |
367 | 367 | ||
diff --git a/drivers/memory/tegra/tegra124-emc.c b/drivers/memory/tegra/tegra124-emc.c index 392dc8dd481f..eedb7d48e2ea 100644 --- a/drivers/memory/tegra/tegra124-emc.c +++ b/drivers/memory/tegra/tegra124-emc.c | |||
@@ -888,8 +888,8 @@ static int load_one_timing_from_dt(struct tegra_emc *emc, | |||
888 | 888 | ||
889 | err = of_property_read_u32(node, "clock-frequency", &value); | 889 | err = of_property_read_u32(node, "clock-frequency", &value); |
890 | if (err) { | 890 | if (err) { |
891 | dev_err(emc->dev, "timing %s: failed to read rate: %d\n", | 891 | dev_err(emc->dev, "timing %pOFn: failed to read rate: %d\n", |
892 | node->name, err); | 892 | node, err); |
893 | return err; | 893 | return err; |
894 | } | 894 | } |
895 | 895 | ||
@@ -900,16 +900,16 @@ static int load_one_timing_from_dt(struct tegra_emc *emc, | |||
900 | ARRAY_SIZE(timing->emc_burst_data)); | 900 | ARRAY_SIZE(timing->emc_burst_data)); |
901 | if (err) { | 901 | if (err) { |
902 | dev_err(emc->dev, | 902 | dev_err(emc->dev, |
903 | "timing %s: failed to read emc burst data: %d\n", | 903 | "timing %pOFn: failed to read emc burst data: %d\n", |
904 | node->name, err); | 904 | node, err); |
905 | return err; | 905 | return err; |
906 | } | 906 | } |
907 | 907 | ||
908 | #define EMC_READ_PROP(prop, dtprop) { \ | 908 | #define EMC_READ_PROP(prop, dtprop) { \ |
909 | err = of_property_read_u32(node, dtprop, &timing->prop); \ | 909 | err = of_property_read_u32(node, dtprop, &timing->prop); \ |
910 | if (err) { \ | 910 | if (err) { \ |
911 | dev_err(emc->dev, "timing %s: failed to read " #prop ": %d\n", \ | 911 | dev_err(emc->dev, "timing %pOFn: failed to read " #prop ": %d\n", \ |
912 | node->name, err); \ | 912 | node, err); \ |
913 | return err; \ | 913 | return err; \ |
914 | } \ | 914 | } \ |
915 | } | 915 | } |