From 51f60a89b75e5b71c747e15b8247abae798244ec Mon Sep 17 00:00:00 2001 From: Ismael Luceno Cortes Date: Mon, 1 Apr 2019 16:09:13 +0000 Subject: 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 --- common/usb_hub.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'common/usb_hub.c') diff --git a/common/usb_hub.c b/common/usb_hub.c index 33aaeb8e44..9069f4b33a 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; } /** -- cgit v1.2.3