nvmem: Convert to using %pOFn instead of device_node.name (badcdff1) · Commits · 戴 / test

In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier. Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by:

Rob Herring <robh@kernel.org> [srinivas: rebased on top of next] Signed-off-by:

Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/nvmem/core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -298,6 +298,7 @@ static void nvmem_cell_drop(struct nvmem_cell *cell)
		mutex_lock(&nvmem_mutex);
		list_del(&cell->node);
		mutex_unlock(&nvmem_mutex);
		kfree(cell->name);
		kfree(cell);
		}

		@@ -547,7 +548,7 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
		cell->nvmem = nvmem;
		cell->offset = be32_to_cpup(addr++);
		cell->bytes = be32_to_cpup(addr);
		cell->name = child->name;
		cell->name = kasprintf(GFP_KERNEL, "%pOFn", child);

		addr = of_get_property(child, "bits", &len);
		if (addr && len == (2 * sizeof(u32))) {
		@@ -564,6 +565,7 @@ static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
		dev_err(dev, "cell %s unaligned to nvmem stride %d\n",
		cell->name, nvmem->stride);
		/* Cells already added will be freed later. */
		kfree(cell->name);
		kfree(cell);
		return -EINVAL;
		}

Admin message