dm: treewide: Rename 'platdata' variables to just 'plat'

We use 'priv' for private data but often use 'platdata' for platform data.
We can't really use 'pdata' since that is ambiguous (it could mean private
or platform data).

Rename some of the latter variables to end with 'plat' for consistency.

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

3 files changed, 19 insertions, 19 deletions

diff --git a/drivers/remoteproc/rproc-uclass.c b/drivers/remoteproc/rproc-uclass.c
index 41ac001d96c..cc640b311be 100644
--- a/drivers/remoteproc/rproc-uclass.c
+++ b/drivers/remoteproc/rproc-uclass.c
@@ -42,7 +42,7 @@ static int for_each_remoteproc_device(int (*fn) (struct udevice *dev,
 	     ret = uclass_find_next_device(&dev)) {
 		if (ret || dev == skip_dev)
 			continue;
-		uc_pdata = dev_get_uclass_platdata(dev);
+		uc_pdata = dev_get_uclass_plat(dev);
 		ret = fn(dev, uc_pdata, data);
 		if (ret)
 			return ret;
@@ -111,11 +111,11 @@ static int rproc_pre_probe(struct udevice *dev)
 	struct dm_rproc_uclass_pdata *uc_pdata;
 	const struct dm_rproc_ops *ops;
 
-	uc_pdata = dev_get_uclass_platdata(dev);
+	uc_pdata = dev_get_uclass_plat(dev);
 
 	/* See if we need to populate via fdt */
 
-	if (!dev->platdata) {
+	if (!dev->plat) {
 #if CONFIG_IS_ENABLED(OF_CONTROL)
 		int node = dev_of_offset(dev);
 		const void *blob = gd->fdt_blob;
@@ -140,7 +140,7 @@ static int rproc_pre_probe(struct udevice *dev)
 #endif
 
 	} else {
-		struct dm_rproc_uclass_pdata *pdata = dev->platdata;
+		struct dm_rproc_uclass_pdata *pdata = dev->plat;
 
 		debug("'%s': using legacy data\n", dev->name);
 		if (pdata->name)
@@ -210,7 +210,7 @@ UCLASS_DRIVER(rproc) = {
 	.flags = DM_UC_FLAG_SEQ_ALIAS,
 	.pre_probe = rproc_pre_probe,
 	.post_probe = rproc_post_probe,
-	.per_device_platdata_auto	=
+	.per_device_plat_auto	=
 		sizeof(struct dm_rproc_uclass_pdata),
 };
 
@@ -306,7 +306,7 @@ int rproc_load(int id, ulong addr, ulong size)
 		return ret;
 	}
 
-	uc_pdata = dev_get_uclass_platdata(dev);
+	uc_pdata = dev_get_uclass_plat(dev);
 
 	ops = rproc_get_ops(dev);
 	if (!ops) {
@@ -366,7 +366,7 @@ static int _rproc_ops_wrapper(int id, enum rproc_ops op)
 		return ret;
 	}
 
-	uc_pdata = dev_get_uclass_platdata(dev);
+	uc_pdata = dev_get_uclass_plat(dev);
 
 	ops = rproc_get_ops(dev);
 	if (!ops) {
diff --git a/drivers/remoteproc/sandbox_testproc.c b/drivers/remoteproc/sandbox_testproc.c
index 7126888698c..ee2ee730712 100644
--- a/drivers/remoteproc/sandbox_testproc.c
+++ b/drivers/remoteproc/sandbox_testproc.c
@@ -128,7 +128,7 @@ static int sandbox_testproc_probe(struct udevice *dev)
 	struct sandbox_test_devdata *ddata;
 	int ret;
 
-	uc_pdata = dev_get_uclass_platdata(dev);
+	uc_pdata = dev_get_uclass_plat(dev);
 	ddata = dev_get_priv(dev);
 	if (!ddata) {
 		debug("%s: platform private data missing\n", uc_pdata->name);
@@ -151,7 +151,7 @@ static int sandbox_testproc_init(struct udevice *dev)
 	struct dm_rproc_uclass_pdata *uc_pdata;
 	int ret;
 
-	uc_pdata = dev_get_uclass_platdata(dev);
+	uc_pdata = dev_get_uclass_plat(dev);
 
 	ret = sandbox_dev_move_to_state(dev, sb_init);
 
@@ -173,7 +173,7 @@ static int sandbox_testproc_reset(struct udevice *dev)
 	struct dm_rproc_uclass_pdata *uc_pdata;
 	int ret;
 
-	uc_pdata = dev_get_uclass_platdata(dev);
+	uc_pdata = dev_get_uclass_plat(dev);
 
 	ret = sandbox_dev_move_to_state(dev, sb_reset);
 
@@ -197,7 +197,7 @@ static int sandbox_testproc_load(struct udevice *dev, ulong addr, ulong size)
 	struct dm_rproc_uclass_pdata *uc_pdata;
 	int ret;
 
-	uc_pdata = dev_get_uclass_platdata(dev);
+	uc_pdata = dev_get_uclass_plat(dev);
 
 	ret = sandbox_dev_move_to_state(dev, sb_loaded);
 
@@ -220,7 +220,7 @@ static int sandbox_testproc_start(struct udevice *dev)
 	struct dm_rproc_uclass_pdata *uc_pdata;
 	int ret;
 
-	uc_pdata = dev_get_uclass_platdata(dev);
+	uc_pdata = dev_get_uclass_plat(dev);
 
 	ret = sandbox_dev_move_to_state(dev, sb_running);
 
@@ -242,7 +242,7 @@ static int sandbox_testproc_stop(struct udevice *dev)
 	struct dm_rproc_uclass_pdata *uc_pdata;
 	int ret;
 
-	uc_pdata = dev_get_uclass_platdata(dev);
+	uc_pdata = dev_get_uclass_plat(dev);
 
 	ret = sandbox_dev_move_to_state(dev, sb_init);
 
@@ -265,7 +265,7 @@ static int sandbox_testproc_is_running(struct udevice *dev)
 	struct sandbox_test_devdata *ddata;
 	int ret = 1;
 
-	uc_pdata = dev_get_uclass_platdata(dev);
+	uc_pdata = dev_get_uclass_plat(dev);
 	ddata = dev_get_priv(dev);
 
 	if (ddata->current_state == sb_running)
@@ -287,7 +287,7 @@ static int sandbox_testproc_ping(struct udevice *dev)
 	struct sandbox_test_devdata *ddata;
 	int ret;
 
-	uc_pdata = dev_get_uclass_platdata(dev);
+	uc_pdata = dev_get_uclass_plat(dev);
 	ddata = dev_get_priv(dev);
 
 	if (ddata->current_state == sb_running)
@@ -354,5 +354,5 @@ static struct dm_rproc_uclass_pdata proc_3_test = {
 
 U_BOOT_DEVICE(proc_3_demo) = {
 	.name = "sandbox_test_proc",
-	.platdata = &proc_3_test,
+	.plat = &proc_3_test,
 };
diff --git a/drivers/remoteproc/ti_power_proc.c b/drivers/remoteproc/ti_power_proc.c
index 14bb2d95ba6..9dbbb44e955 100644
--- a/drivers/remoteproc/ti_power_proc.c
+++ b/drivers/remoteproc/ti_power_proc.c
@@ -71,7 +71,7 @@ static int ti_powerproc_probe(struct udevice *dev)
 	struct ti_powerproc_privdata *priv;
 	int ret;
 
-	uc_pdata = dev_get_uclass_platdata(dev);
+	uc_pdata = dev_get_uclass_plat(dev);
 	priv = dev_get_priv(dev);
 
 	ret = ti_of_to_priv(dev, priv);
@@ -96,7 +96,7 @@ static int ti_powerproc_load(struct udevice *dev, ulong addr, ulong size)
 	struct ti_powerproc_privdata *priv;
 	int ret;
 
-	uc_pdata = dev_get_uclass_platdata(dev);
+	uc_pdata = dev_get_uclass_plat(dev);
 	if (!uc_pdata) {
 		debug("%s: no uc pdata!\n", dev->name);
 		return -EINVAL;
@@ -131,7 +131,7 @@ static int ti_powerproc_start(struct udevice *dev)
 	struct ti_powerproc_privdata *priv;
 	int ret;
 
-	uc_pdata = dev_get_uclass_platdata(dev);
+	uc_pdata = dev_get_uclass_plat(dev);
 	if (!uc_pdata) {
 		debug("%s: no uc pdata!\n", dev->name);
 		return -EINVAL;