diff options
author | Tom Rini <trini@konsulko.com> | 2022-09-25 17:20:11 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-09-25 17:20:11 -0400 |
commit | 9114b7cee817789ad59e0fb6d5cd57f50668b4e1 (patch) | |
tree | a6bd3d83314fee80b1b1a2e9a39df39d96a2dcc8 /common/usb_storage.c | |
parent | 81da5042e514bfd27516d3530dde4d62a6708ca4 (diff) | |
parent | 22c80d5603ac4c58debc8c776b8f138e76cf5f7c (diff) |
Merge tag 'dm-next-25sep22' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm into next
sandbox SCSI conversion to driver model
final patch for blk improvements
Diffstat (limited to 'common/usb_storage.c')
-rw-r--r-- | common/usb_storage.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/usb_storage.c b/common/usb_storage.c index 7d420160cd5..e59c819bac5 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -279,7 +279,7 @@ static int usb_stor_probe_device(struct usb_device *udev) blkdev = &usb_dev_desc[usb_max_devs]; memset(blkdev, '\0', sizeof(struct blk_desc)); - blkdev->if_type = UCLASS_USB; + blkdev->uclass_id = UCLASS_USB; blkdev->devnum = usb_max_devs; blkdev->part_type = PART_TYPE_UNKNOWN; blkdev->target = 0xff; @@ -1577,8 +1577,8 @@ U_BOOT_DRIVER(usb_storage_blk) = { }; #else U_BOOT_LEGACY_BLK(usb) = { - .if_typename = "usb", - .if_type = UCLASS_USB, + .uclass_idname = "usb", + .uclass_id = UCLASS_USB, .max_devs = USB_MAX_STOR_DEV, .desc = usb_dev_desc, }; |