diff options
Diffstat (limited to 'drivers/usb/core/hub.c')
-rw-r--r-- | drivers/usb/core/hub.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 338f91ff54cb..3edc01bc41f7 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -2793,7 +2793,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, | |||
2793 | int i, j, retval; | 2793 | int i, j, retval; |
2794 | unsigned delay = HUB_SHORT_RESET_TIME; | 2794 | unsigned delay = HUB_SHORT_RESET_TIME; |
2795 | enum usb_device_speed oldspeed = udev->speed; | 2795 | enum usb_device_speed oldspeed = udev->speed; |
2796 | char *speed, *type; | 2796 | const char *speed; |
2797 | int devnum = udev->devnum; | 2797 | int devnum = udev->devnum; |
2798 | 2798 | ||
2799 | /* root hub ports have a slightly longer reset period | 2799 | /* root hub ports have a slightly longer reset period |
@@ -2853,25 +2853,16 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, | |||
2853 | default: | 2853 | default: |
2854 | goto fail; | 2854 | goto fail; |
2855 | } | 2855 | } |
2856 | 2856 | ||
2857 | type = ""; | 2857 | if (udev->speed == USB_SPEED_WIRELESS) |
2858 | switch (udev->speed) { | 2858 | speed = "variable speed Wireless"; |
2859 | case USB_SPEED_LOW: speed = "low"; break; | 2859 | else |
2860 | case USB_SPEED_FULL: speed = "full"; break; | 2860 | speed = usb_speed_string(udev->speed); |
2861 | case USB_SPEED_HIGH: speed = "high"; break; | 2861 | |
2862 | case USB_SPEED_SUPER: | ||
2863 | speed = "super"; | ||
2864 | break; | ||
2865 | case USB_SPEED_WIRELESS: | ||
2866 | speed = "variable"; | ||
2867 | type = "Wireless "; | ||
2868 | break; | ||
2869 | default: speed = "?"; break; | ||
2870 | } | ||
2871 | if (udev->speed != USB_SPEED_SUPER) | 2862 | if (udev->speed != USB_SPEED_SUPER) |
2872 | dev_info(&udev->dev, | 2863 | dev_info(&udev->dev, |
2873 | "%s %s speed %sUSB device number %d using %s\n", | 2864 | "%s %s USB device number %d using %s\n", |
2874 | (udev->config) ? "reset" : "new", speed, type, | 2865 | (udev->config) ? "reset" : "new", speed, |
2875 | devnum, udev->bus->controller->driver->name); | 2866 | devnum, udev->bus->controller->driver->name); |
2876 | 2867 | ||
2877 | /* Set up TT records, if needed */ | 2868 | /* Set up TT records, if needed */ |