Skip to contentSkip to conversation

usb: Make portspeed return a read-only string

PATCH New Ismael Luceno Cortes 2 participants 2 messages Apr 1, 2019 – Apr 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 cmd/usb.c        | 18 +++++-------------
 common/usb_hub.c | 18 +++++-------------
 2 files changed, 10 insertions(+), 26 deletions(-)
cmd/usb.c +5 -13
index 0ccb1b5148..dd9ac0bc97 100644
@@ -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 */
common/usb_hub.c +5 -13
index 33aaeb8e44..9069f4b33a 100644
@@ -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;
 }
 
 /**
Signature · 1 line
2.19.1
Applied
#1 lore raw

PATCH 1/1 usb: Make portspeed return a read-only string

Quoted 72 lines · Ismael Luceno Cortes

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

---
 cmd/usb.c        | 18 +++++-------------
 common/usb_hub.c | 18 +++++-------------
 2 files changed, 10 insertions(+), 26 deletions(-)
cmd/usb.c +5 -13
index 0ccb1b5148..dd9ac0bc97 100644
@@ -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 */
common/usb_hub.c +4 -9
index 33aaeb8e44..9069f4b33a 100644
@@ -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";

common/usb_hub.c static struct usb_hub_device *usb_hub_allocate(void) · line 250

Quoted 10 lines
common/usb_hub.c +1 -4
 	default:
-		speed_str = "12 Mb/s";
-		break;
+		return "12 Mb/s";
 	}
-
-	return speed_str;
 }
 
 /**

Applied to next, thanks!

Signature · 2 lines
Best regards,
Marek Vasut