aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-04-11 14:29:37 -0400
committerTom Rini <trini@konsulko.com>2019-04-11 14:29:37 -0400
commit02f173ca156cee8526dff87603d5e446b443cde3 (patch)
tree87bb57919f1a78d8e983aa948bc89deca7005e37 /common
parentf95fdf237d8de9bf4dac4e4449015692c2283ac4 (diff)
parent69535b33bc1fce43dcc10b646cf44db81cffa131 (diff)
downloadu-boot-02f173ca156cee8526dff87603d5e446b443cde3.zip
u-boot-02f173ca156cee8526dff87603d5e446b443cde3.tar.gz
u-boot-02f173ca156cee8526dff87603d5e446b443cde3.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'common')
-rw-r--r--common/usb_hub.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/common/usb_hub.c b/common/usb_hub.c
index 33aaeb8..9069f4b 100644
--- a/common/usb_hub.c
+++ b/common/usb_hub.c
@@ -233,26 +233,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;
}
/**