4 files changed, 16 insertions, 16 deletions
diff --git a/drivers/demo/demo-pdata.c b/drivers/demo/demo-pdata.c
index 2f434f8db0..b504c31373 100644
--- a/drivers/demo/demo-pdata.c
+++ b/drivers/demo/demo-pdata.c
@@ -22,25 +22,25 @@ static const struct dm_demo_pdata yellow_hexagon = {
 
 U_BOOT_DEVICE(demo0) = {
 	.name = "demo_shape_drv",
-	.platdata = &red_square,
+	.plat = &red_square,
 };
 
 U_BOOT_DEVICE(demo1) = {
 	.name = "demo_simple_drv",
-	.platdata = &red_square,
+	.plat = &red_square,
 };
 
 U_BOOT_DEVICE(demo2) = {
 	.name = "demo_shape_drv",
-	.platdata = &green_triangle,
+	.plat = &green_triangle,
 };
 
 U_BOOT_DEVICE(demo3) = {
 	.name = "demo_simple_drv",
-	.platdata = &yellow_hexagon,
+	.plat = &yellow_hexagon,
 };
 
 U_BOOT_DEVICE(demo4) = {
 	.name = "demo_shape_drv",
-	.platdata = &yellow_hexagon,
+	.plat = &yellow_hexagon,
 };
diff --git a/drivers/demo/demo-shape.c b/drivers/demo/demo-shape.c
index 8686c99845..8129317ba1 100644
--- a/drivers/demo/demo-shape.c
+++ b/drivers/demo/demo-shape.c
@@ -28,7 +28,7 @@ struct shape_data {
 /* Crazy little function to draw shapes on the console */
 static int shape_hello(struct udevice *dev, int ch)
 {
-	const struct dm_demo_pdata *pdata = dev_get_platdata(dev);
+	const struct dm_demo_pdata *pdata = dev_get_plat(dev);
 	struct shape_data *data = dev_get_priv(dev);
 	static const struct shape {
 		int start;
@@ -140,9 +140,9 @@ static const struct demo_ops shape_ops = {
 	.set_light = set_light,
 };
 
-static int shape_ofdata_to_platdata(struct udevice *dev)
+static int shape_of_to_plat(struct udevice *dev)
 {
-	struct dm_demo_pdata *pdata = dev_get_platdata(dev);
+	struct dm_demo_pdata *pdata = dev_get_plat(dev);
 	int ret;
 
 	/* Parse the data that is common with all demo devices */
@@ -189,10 +189,10 @@ U_BOOT_DRIVER(demo_shape_drv) = {
 	.name	= "demo_shape_drv",
 	.of_match = demo_shape_id,
 	.id	= UCLASS_DEMO,
-	.ofdata_to_platdata = shape_ofdata_to_platdata,
+	.of_to_plat = shape_of_to_plat,
 	.ops	= &shape_ops,
 	.probe = dm_shape_probe,
 	.remove = dm_shape_remove,
-	.priv_auto_alloc_size = sizeof(struct shape_data),
-	.platdata_auto_alloc_size = sizeof(struct dm_demo_pdata),
+	.priv_auto	= sizeof(struct shape_data),
+	.plat_auto	= sizeof(struct dm_demo_pdata),
 };
diff --git a/drivers/demo/demo-simple.c b/drivers/demo/demo-simple.c
index 68972c780f..28b271f779 100644
--- a/drivers/demo/demo-simple.c
+++ b/drivers/demo/demo-simple.c
@@ -14,7 +14,7 @@
 
 static int simple_hello(struct udevice *dev, int ch)
 {
-	const struct dm_demo_pdata *pdata = dev_get_platdata(dev);
+	const struct dm_demo_pdata *pdata = dev_get_plat(dev);
 
 	printf("Hello from %08x: %s %d\n", (uint)map_to_sysmem(dev), pdata->colour,
 	       pdata->sides);
@@ -26,7 +26,7 @@ static const struct demo_ops simple_ops = {
 	.hello = simple_hello,
 };
 
-static int demo_shape_ofdata_to_platdata(struct udevice *dev)
+static int demo_shape_of_to_plat(struct udevice *dev)
 {
 	/* Parse the data that is common with all demo devices */
 	return demo_parse_dt(dev);
@@ -41,7 +41,7 @@ U_BOOT_DRIVER(demo_simple_drv) = {
 	.name	= "demo_simple_drv",
 	.of_match = demo_shape_id,
 	.id	= UCLASS_DEMO,
-	.ofdata_to_platdata = demo_shape_ofdata_to_platdata,
+	.of_to_plat = demo_shape_of_to_plat,
 	.ops	= &simple_ops,
-	.platdata_auto_alloc_size = sizeof(struct dm_demo_pdata),
+	.plat_auto	= sizeof(struct dm_demo_pdata),
 };
diff --git a/drivers/demo/demo-uclass.c b/drivers/demo/demo-uclass.c
index 6c36f03254..a020ecb24f 100644
--- a/drivers/demo/demo-uclass.c
+++ b/drivers/demo/demo-uclass.c
@@ -65,7 +65,7 @@ int demo_set_light(struct udevice *dev, int light)
 
 int demo_parse_dt(struct udevice *dev)
 {
-	struct dm_demo_pdata *pdata = dev_get_platdata(dev);
+	struct dm_demo_pdata *pdata = dev_get_plat(dev);
 	int dn = dev_of_offset(dev);
 
 	pdata->sides = fdtdec_get_int(gd->fdt_blob, dn, "sides", 0);