Merge tag 'mmc-2021-2-19' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc

[pandora-u-boot.git] / common / usb_hub.c

diff --git a/common/usb_hub.c b/common/usb_hub.c
index 33aaeb8..3d856e7 100644 (file)
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -24,11 +24,15 @@
 #include <common.h>
 #include <command.h>
 #include <dm.h>
+#include <env.h>
 #include <errno.h>
+#include <log.h>
+#include <malloc.h>
 #include <memalign.h>
 #include <asm/processor.h>
 #include <asm/unaligned.h>
 #include <linux/ctype.h>
+#include <linux/delay.h>
 #include <linux/list.h>
 #include <asm/byteorder.h>
 #ifdef CONFIG_SANDBOX
@@ -233,26 +237,18 @@ static struct usb_hub_device *usb_hub_allocate(void)
 
 #define MAX_TRIES 5
 
-static inline char *portspeed(int portstatus)
+static inline const char *portspeed(int portstatus)
 {
-       char *speed_str;
-
        switch (portstatus & USB_PORT_STAT_SPEED_MASK) {
        case USB_PORT_STAT_SUPER_SPEED:
-               speed_str = "5 Gb/s";
-               break;
+               return "5 Gb/s";
        case USB_PORT_STAT_HIGH_SPEED:
-               speed_str = "480 Mb/s";
-               break;
+               return "480 Mb/s";
        case USB_PORT_STAT_LOW_SPEED:
-               speed_str = "1.5 Mb/s";
-               break;
+               return "1.5 Mb/s";
        default:
-               speed_str = "12 Mb/s";
-               break;
+               return "12 Mb/s";
        }
-
-       return speed_str;
 }
 
 /**
@@ -962,9 +958,9 @@ UCLASS_DRIVER(usb_hub) = {
        .post_bind      = dm_scan_fdt_dev,
        .post_probe     = usb_hub_post_probe,
        .child_pre_probe        = usb_child_pre_probe,
-       .per_child_auto_alloc_size = sizeof(struct usb_device),
-       .per_child_platdata_auto_alloc_size = sizeof(struct usb_dev_platdata),
-       .per_device_auto_alloc_size = sizeof(struct usb_hub_device),
+       .per_child_auto = sizeof(struct usb_device),
+       .per_child_plat_auto    = sizeof(struct usb_dev_plat),
+       .per_device_auto        = sizeof(struct usb_hub_device),
 };
 
 static const struct usb_device_id hub_id_table[] = {