Merge tag 'dm-pull-14dec20' of git://git.denx.de/u-boot-dm into next

Driver model tidy-up for livetree
Driver model big rename for consistency
Python 3 clean-ups for patman
Update sandbox serial driver to use membuff

1 files changed, 15 insertions, 15 deletions

diff --git a/drivers/xen/pvblock.c b/drivers/xen/pvblock.c
index 1b3325bbe2..6455dfd5c9 100644
--- a/drivers/xen/pvblock.c
+++ b/drivers/xen/pvblock.c
@@ -70,7 +70,7 @@ struct blkfront_dev {
 	u8 *bounce_buffer;
 };
 
-struct blkfront_platdata {
+struct blkfront_plat {
 	unsigned int devid;
 };
 
@@ -600,7 +600,7 @@ static ulong pvblock_iop(struct udevice *udev, lbaint_t blknr,
 			 lbaint_t blkcnt, void *buffer, int write)
 {
 	struct blkfront_dev *blk_dev = dev_get_priv(udev);
-	struct blk_desc *desc = dev_get_uclass_platdata(udev);
+	struct blk_desc *desc = dev_get_uclass_plat(udev);
 	struct blkfront_aiocb aiocb;
 	lbaint_t blocks_todo;
 	bool unaligned;
@@ -658,7 +658,7 @@ ulong pvblock_blk_write(struct udevice *udev, lbaint_t blknr, lbaint_t blkcnt,
 
 static int pvblock_blk_bind(struct udevice *udev)
 {
-	struct blk_desc *desc = dev_get_uclass_platdata(udev);
+	struct blk_desc *desc = dev_get_uclass_plat(udev);
 	int devnum;
 
 	desc->if_type = IF_TYPE_PVBLOCK;
@@ -685,12 +685,12 @@ static int pvblock_blk_bind(struct udevice *udev)
 static int pvblock_blk_probe(struct udevice *udev)
 {
 	struct blkfront_dev *blk_dev = dev_get_priv(udev);
-	struct blkfront_platdata *platdata = dev_get_platdata(udev);
-	struct blk_desc *desc = dev_get_uclass_platdata(udev);
+	struct blkfront_plat *plat = dev_get_plat(udev);
+	struct blk_desc *desc = dev_get_uclass_plat(udev);
 	int ret, devid;
 
-	devid = platdata->devid;
-	free(platdata);
+	devid = plat->devid;
+	free(plat);
 
 	ret = init_blkfront(devid, blk_dev);
 	if (ret < 0)
@@ -723,7 +723,7 @@ U_BOOT_DRIVER(pvblock_blk) = {
 	.bind			= pvblock_blk_bind,
 	.probe			= pvblock_blk_probe,
 	.remove			= pvblock_blk_remove,
-	.priv_auto_alloc_size	= sizeof(struct blkfront_dev),
+	.priv_auto	= sizeof(struct blkfront_dev),
 	.flags			= DM_FLAG_OS_PREPARE,
 };
 
@@ -737,27 +737,27 @@ static int on_new_vbd(struct udevice *parent, unsigned int devid)
 {
 	struct driver_info info;
 	struct udevice *udev;
-	struct blkfront_platdata *platdata;
+	struct blkfront_plat *plat;
 	int ret;
 
 	debug("New " DRV_NAME_BLK ", device ID %d\n", devid);
 
-	platdata = malloc(sizeof(struct blkfront_platdata));
-	if (!platdata) {
+	plat = malloc(sizeof(struct blkfront_plat));
+	if (!plat) {
 		printf("Failed to allocate platform data\n");
 		return -ENOMEM;
 	}
 
-	platdata->devid = devid;
+	plat->devid = devid;
 
 	info.name = DRV_NAME_BLK;
-	info.platdata = platdata;
+	info.plat = plat;
 
 	ret = device_bind_by_name(parent, false, &info, &udev);
 	if (ret < 0) {
 		printf("Failed to bind " DRV_NAME_BLK " to device with ID %d, ret: %d\n",
 		       devid, ret);
-		free(platdata);
+		free(plat);
 	}
 	return ret;
 }
@@ -802,7 +802,7 @@ static void print_pvblock_devices(void)
 	class_name = uclass_get_name(UCLASS_PVBLOCK);
 	for (blk_first_device(IF_TYPE_PVBLOCK, &udev); udev;
 	     blk_next_device(&udev), first = false) {
-		struct blk_desc *desc = dev_get_uclass_platdata(udev);
+		struct blk_desc *desc = dev_get_uclass_plat(udev);
 
 		if (!first)
 			puts(", ");