commit aad29aea5b775261af26bf17e400a193b18991df
author Simon Glass <sjg@chromium.org> Thu Dec 03 16:55:21 2020 -0700
committer Simon Glass <sjg@chromium.org> Sun Dec 13 16:51:09 2020 -0700
tree 1931d0c875e829620180bf383722c1a69bd1a951
parent fa20e93694a223c3ae35c358105975ee59912b4e

dm: treewide: Rename ofdata_to_platdata() to of_to_plat()

This name is far too long. Rename it to remove the 'data' bits. This makes
it consistent with the platdata->plat rename.

Signed-off-by: Simon Glass <sjg@chromium.org>

drivers/core/acpi.c

diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c
index 63a791f..0901b92 100644
--- a/drivers/core/acpi.c
+++ b/drivers/core/acpi.c
@@ -269,7 +269,7 @@
 		void *start = ctx->current;
 
 		log_debug("- method %d, %s %p\n", method, parent->name, func);
-		ret = device_ofdata_to_platdata(parent);
+		ret = device_of_to_plat(parent);
 		if (ret)
 			return log_msg_ret("ofdata", ret);
 		ret = func(parent, ctx);

drivers/core/device.c

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 332b1d0..a6b8c3e 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -326,7 +326,7 @@
 	return priv;
 }
 
-int device_ofdata_to_platdata(struct udevice *dev)
+int device_of_to_plat(struct udevice *dev)
 {
 	const struct driver *drv;
 	int size = 0;
@@ -340,7 +340,7 @@
 
 	/* Ensure all parents have ofdata */
 	if (dev->parent) {
-		ret = device_ofdata_to_platdata(dev->parent);
+		ret = device_of_to_plat(dev->parent);
 		if (ret)
 			goto fail;
 
@@ -391,9 +391,9 @@
 		}
 	}
 
-	if (drv->ofdata_to_platdata &&
+	if (drv->of_to_plat &&
 	    (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) {
-		ret = drv->ofdata_to_platdata(dev);
+		ret = drv->of_to_plat(dev);
 		if (ret)
 			goto fail;
 	}
@@ -422,7 +422,7 @@
 	drv = dev->driver;
 	assert(drv);
 
-	ret = device_ofdata_to_platdata(dev);
+	ret = device_of_to_plat(dev);
 	if (ret)
 		goto fail;
 
@@ -881,7 +881,7 @@
 	if (!dev)
 		return -ENODEV;
 
-	ret = device_ofdata_to_platdata(dev);
+	ret = device_of_to_plat(dev);
 	if (ret)
 		return ret;
 
@@ -899,7 +899,7 @@
 	if (!dev)
 		return -ENODEV;
 
-	ret = device_ofdata_to_platdata(dev);
+	ret = device_of_to_plat(dev);
 	if (ret)
 		return ret;
 

drivers/core/devres.c

diff --git a/drivers/core/devres.c b/drivers/core/devres.c
index 8824469..522b07d 100644
--- a/drivers/core/devres.c
+++ b/drivers/core/devres.c
@@ -23,7 +23,7 @@
 /** enum devres_phase - Shows where resource was allocated
  *
  * DEVRES_PHASE_BIND: In the bind() method
- * DEVRES_PHASE_OFDATA: In the ofdata_to_platdata() method
+ * DEVRES_PHASE_OFDATA: In the of_to_plat() method
  * DEVRES_PHASE_PROBE: In the probe() method
  */
 enum devres_phase {

drivers/core/root.c

diff --git a/drivers/core/root.c b/drivers/core/root.c
index 348dc9e..42f8f0c 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -69,8 +69,8 @@
 			entry->remove += gd->reloc_off;
 		if (entry->unbind)
 			entry->unbind += gd->reloc_off;
-		if (entry->ofdata_to_platdata)
-			entry->ofdata_to_platdata += gd->reloc_off;
+		if (entry->of_to_plat)
+			entry->of_to_plat += gd->reloc_off;
 		if (entry->child_post_bind)
 			entry->child_post_bind += gd->reloc_off;
 		if (entry->child_pre_probe)