1
0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00

usb: Make portspeed return a read-only string

Current code is plain wrong, and there's no need to have a mutable string,
so fix function type and remove the intermediate variable.

Signed-off-by: Ismael Luceno <ismael.luceno@silicon-gears.com>
This commit is contained in:
Ismael Luceno Cortes
2019-04-01 16:09:13 +00:00
committed by Marek Vasut
parent 89aea23abb
commit 51f60a89b7
2 changed files with 10 additions and 26 deletions

View File

@@ -316,26 +316,18 @@ static struct usb_device *usb_find_device(int devnum)
return NULL; return NULL;
} }
static inline char *portspeed(int speed) static inline const char *portspeed(int speed)
{ {
char *speed_str;
switch (speed) { switch (speed) {
case USB_SPEED_SUPER: case USB_SPEED_SUPER:
speed_str = "5 Gb/s"; return "5 Gb/s";
break;
case USB_SPEED_HIGH: case USB_SPEED_HIGH:
speed_str = "480 Mb/s"; return "480 Mb/s";
break;
case USB_SPEED_LOW: case USB_SPEED_LOW:
speed_str = "1.5 Mb/s"; return "1.5 Mb/s";
break;
default: default:
speed_str = "12 Mb/s"; return "12 Mb/s";
break;
} }
return speed_str;
} }
/* shows the device tree recursively */ /* shows the device tree recursively */

View File

@@ -233,26 +233,18 @@ static struct usb_hub_device *usb_hub_allocate(void)
#define MAX_TRIES 5 #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) { switch (portstatus & USB_PORT_STAT_SPEED_MASK) {
case USB_PORT_STAT_SUPER_SPEED: case USB_PORT_STAT_SUPER_SPEED:
speed_str = "5 Gb/s"; return "5 Gb/s";
break;
case USB_PORT_STAT_HIGH_SPEED: case USB_PORT_STAT_HIGH_SPEED:
speed_str = "480 Mb/s"; return "480 Mb/s";
break;
case USB_PORT_STAT_LOW_SPEED: case USB_PORT_STAT_LOW_SPEED:
speed_str = "1.5 Mb/s"; return "1.5 Mb/s";
break;
default: default:
speed_str = "12 Mb/s"; return "12 Mb/s";
break;
} }
return speed_str;
} }
/** /**