Commit c86f9854 authored by Rob Herring's avatar Rob Herring
Browse files

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: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 2ef790dc

drivers/memory/omap-gpmc.c

+7 −11
Original line number Diff line number Diff line
@@ -2145,8 +2145,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, 
			gpmc_s.device_width = GPMC_DEVWIDTH_16BIT;

			break;

		default:

			dev_err(&pdev->dev, "%s: invalid 'nand-bus-width'\n",

				child->name);

			dev_err(&pdev->dev, "%pOFn: invalid 'nand-bus-width'\n",

				child);

			ret = -EINVAL;

			goto err;

		}
@@ -2186,8 +2186,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, 


	ret = gpmc_cs_set_timings(cs, &gpmc_t, &gpmc_s);

	if (ret) {

		dev_err(&pdev->dev, "failed to set gpmc timings for: %s\n",

			child->name);

		dev_err(&pdev->dev, "failed to set gpmc timings for: %pOFn\n",

			child);

		goto err_cs;

	}
@@ -2215,7 +2215,7 @@ no_timings: 


err_child_fail:



	dev_err(&pdev->dev, "failed to create gpmc child %s\n", child->name);

	dev_err(&pdev->dev, "failed to create gpmc child %pOFn\n", child);

	ret = -ENODEV;



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



	for_each_available_child_of_node(pdev->dev.of_node, child) {



		if (!child->name)

			continue;



		ret = gpmc_probe_generic_child(pdev, child);

		if (ret) {

			dev_err(&pdev->dev, "failed to probe DT child '%s': %d\n",

				child->name, ret);

			dev_err(&pdev->dev, "failed to probe DT child '%pOFn': %d\n",

				child, ret);

		}

	}

}

drivers/memory/samsung/exynos-srom.c

+2 −2
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ static int exynos_srom_probe(struct platform_device *pdev) 
	for_each_child_of_node(np, child) {

		if (exynos_srom_configure_bank(srom, child)) {

			dev_err(dev,

				"Could not decode bank configuration for %s\n",

				child->name);

				"Could not decode bank configuration for %pOFn\n",

				child);

			bad_bank_config = true;

		}

	}

drivers/memory/tegra/mc.c

+3 −3
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static int load_one_timing(struct tegra_mc *mc, 
	err = of_property_read_u32(node, "clock-frequency", &tmp);

	if (err) {

		dev_err(mc->dev,

			"timing %s: failed to read rate\n", node->name);

			"timing %pOFn: failed to read rate\n", node);

		return err;

	}
@@ -360,8 +360,8 @@ static int load_one_timing(struct tegra_mc *mc, 
					 mc->soc->num_emem_regs);

	if (err) {

		dev_err(mc->dev,

			"timing %s: failed to read EMEM configuration\n",

			node->name);

			"timing %pOFn: failed to read EMEM configuration\n",

			node);

		return err;

	}

drivers/memory/tegra/tegra124-emc.c

+6 −6
Original line number Diff line number Diff line
@@ -888,8 +888,8 @@ static int load_one_timing_from_dt(struct tegra_emc *emc, 


	err = of_property_read_u32(node, "clock-frequency", &value);

	if (err) {

		dev_err(emc->dev, "timing %s: failed to read rate: %d\n",

			node->name, err);

		dev_err(emc->dev, "timing %pOFn: failed to read rate: %d\n",

			node, err);

		return err;

	}
@@ -900,16 +900,16 @@ static int load_one_timing_from_dt(struct tegra_emc *emc, 
					 ARRAY_SIZE(timing->emc_burst_data));

	if (err) {

		dev_err(emc->dev,

			"timing %s: failed to read emc burst data: %d\n",

			node->name, err);

			"timing %pOFn: failed to read emc burst data: %d\n",

			node, err);

		return err;

	}



#define EMC_READ_PROP(prop, dtprop) { \

	err = of_property_read_u32(node, dtprop, &timing->prop); \

	if (err) { \

		dev_err(emc->dev, "timing %s: failed to read " #prop ": %d\n", \

			node->name, err); \

		dev_err(emc->dev, "timing %pOFn: failed to read " #prop ": %d\n", \

			node, err); \

		return err; \

	} \

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE