commit 541f62c2f923a1ae4b182ce19d45830154f7e264
author Simon Glass <sjg@chromium.org> Tue Dec 22 19:30:30 2020 -0700
committer Simon Glass <sjg@chromium.org> Tue Jan 05 12:24:40 2021 -0700
tree 8d35bd5f521f515995ec85d9276d39c917b7b6b2
parent 2543b16007a4545a1858f3462ee4c7ee8b331a94

dm: core: Rename the priv/plat members

These are supposed to be private to driver model, not accessed by any code
outside. Add a trailing underscore to indicate this.

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

drivers/core/device.c

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 261c3b2..a4c8310 100644
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -514,7 +514,7 @@
 		return NULL;
 	}
 
-	return dev->plat;
+	return dev->plat_;
 }
 
 void *dev_get_parent_plat(const struct udevice *dev)
@@ -524,7 +524,7 @@
 		return NULL;
 	}
 
-	return dev->parent_plat;
+	return dev->parent_plat_;
 }
 
 void *dev_get_uclass_plat(const struct udevice *dev)
@@ -534,7 +534,7 @@
 		return NULL;
 	}
 
-	return dev->uclass_plat;
+	return dev->uclass_plat_;
 }
 
 void *dev_get_priv(const struct udevice *dev)
@@ -544,7 +544,7 @@
 		return NULL;
 	}
 
-	return dev->priv;
+	return dev->priv_;
 }
 
 void *dev_get_uclass_priv(const struct udevice *dev)
@@ -554,7 +554,7 @@
 		return NULL;
 	}
 
-	return dev->uclass_priv;
+	return dev->uclass_priv_;
 }
 
 void *dev_get_parent_priv(const struct udevice *dev)
@@ -564,7 +564,7 @@
 		return NULL;
 	}
 
-	return dev->parent_priv;
+	return dev->parent_priv_;
 }
 
 static int device_get_device_tail(struct udevice *dev, int ret,
@@ -966,32 +966,32 @@
 
 void dev_set_priv(struct udevice *dev, void *priv)
 {
-	dev->priv = priv;
+	dev->priv_ = priv;
 }
 
 void dev_set_parent_priv(struct udevice *dev, void *parent_priv)
 {
-	dev->parent_priv = parent_priv;
+	dev->parent_priv_ = parent_priv;
 }
 
 void dev_set_uclass_priv(struct udevice *dev, void *uclass_priv)
 {
-	dev->uclass_priv = uclass_priv;
+	dev->uclass_priv_ = uclass_priv;
 }
 
 void dev_set_plat(struct udevice *dev, void *plat)
 {
-	dev->plat = plat;
+	dev->plat_ = plat;
 }
 
 void dev_set_parent_plat(struct udevice *dev, void *parent_plat)
 {
-	dev->parent_plat = parent_plat;
+	dev->parent_plat_ = parent_plat;
 }
 
 void dev_set_uclass_plat(struct udevice *dev, void *uclass_plat)
 {
-	dev->uclass_plat = uclass_plat;
+	dev->uclass_plat_ = uclass_plat;
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)

drivers/core/uclass.c

diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index e845f60..f60bc9a 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -165,12 +165,12 @@
 
 void *uclass_get_priv(const struct uclass *uc)
 {
-	return uc->priv;
+	return uc->priv_;
 }
 
 void uclass_set_priv(struct uclass *uc, void *priv)
 {
-	uc->priv = priv;
+	uc->priv_ = priv;
 }
 
 enum uclass_id uclass_get_by_name(const char *name)