Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

usb: Make portspeed return a read-only string

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cmd/usb.c
View file

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

18
common/usb_hub.c
View file

@ -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;
}
/**