Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: rename USB_SPEED_VARIABLE to USB_SPEED_WIRELESS

It's really the wireless speed, so rename the thing to make
more sense. Based on a recommendation from David Vrabel

Cc: David Vrabel <david.vrabel@csr.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+12 -12
+1 -1
drivers/staging/usbip/vhci_sysfs.c
··· 144 144 case USB_SPEED_LOW: 145 145 case USB_SPEED_FULL: 146 146 case USB_SPEED_HIGH: 147 - case USB_SPEED_VARIABLE: 147 + case USB_SPEED_WIRELESS: 148 148 break; 149 149 default: 150 150 usbip_uerr("speed %d\n", speed);
+3 -3
drivers/usb/core/hub.c
··· 1990 1990 if (!(portstatus & USB_PORT_STAT_RESET) && 1991 1991 (portstatus & USB_PORT_STAT_ENABLE)) { 1992 1992 if (hub_is_wusb(hub)) 1993 - udev->speed = USB_SPEED_VARIABLE; 1993 + udev->speed = USB_SPEED_WIRELESS; 1994 1994 else if (portstatus & USB_PORT_STAT_HIGH_SPEED) 1995 1995 udev->speed = USB_SPEED_HIGH; 1996 1996 else if (portstatus & USB_PORT_STAT_LOW_SPEED) ··· 2689 2689 */ 2690 2690 switch (udev->speed) { 2691 2691 case USB_SPEED_SUPER: 2692 - case USB_SPEED_VARIABLE: /* fixed at 512 */ 2692 + case USB_SPEED_WIRELESS: /* fixed at 512 */ 2693 2693 udev->ep0.desc.wMaxPacketSize = cpu_to_le16(512); 2694 2694 break; 2695 2695 case USB_SPEED_HIGH: /* fixed at 64 */ ··· 2717 2717 case USB_SPEED_SUPER: 2718 2718 speed = "super"; 2719 2719 break; 2720 - case USB_SPEED_VARIABLE: 2720 + case USB_SPEED_WIRELESS: 2721 2721 speed = "variable"; 2722 2722 type = "Wireless "; 2723 2723 break;
+1 -1
drivers/usb/core/sysfs.c
··· 115 115 case USB_SPEED_HIGH: 116 116 speed = "480"; 117 117 break; 118 - case USB_SPEED_VARIABLE: 118 + case USB_SPEED_WIRELESS: 119 119 speed = "480"; 120 120 break; 121 121 case USB_SPEED_SUPER:
+3 -3
drivers/usb/core/urb.c
··· 437 437 case USB_ENDPOINT_XFER_INT: 438 438 /* too small? */ 439 439 switch (dev->speed) { 440 - case USB_SPEED_VARIABLE: 440 + case USB_SPEED_WIRELESS: 441 441 if (urb->interval < 6) 442 442 return -EINVAL; 443 443 break; ··· 453 453 if (urb->interval > (1 << 15)) 454 454 return -EINVAL; 455 455 max = 1 << 15; 456 - case USB_SPEED_VARIABLE: 456 + case USB_SPEED_WIRELESS: 457 457 if (urb->interval > 16) 458 458 return -EINVAL; 459 459 break; ··· 480 480 default: 481 481 return -EINVAL; 482 482 } 483 - if (dev->speed != USB_SPEED_VARIABLE) { 483 + if (dev->speed != USB_SPEED_WIRELESS) { 484 484 /* Round down to a power of 2, no more than max */ 485 485 urb->interval = min(max, 1 << ilog2(urb->interval)); 486 486 }
+2 -2
drivers/usb/host/xhci-mem.c
··· 454 454 case USB_SPEED_LOW: 455 455 slot_ctx->dev_info |= (u32) SLOT_SPEED_LS; 456 456 break; 457 - case USB_SPEED_VARIABLE: 457 + case USB_SPEED_WIRELESS: 458 458 xhci_dbg(xhci, "FIXME xHCI doesn't support wireless speeds\n"); 459 459 return -EINVAL; 460 460 break; ··· 498 498 case USB_SPEED_LOW: 499 499 ep0_ctx->ep_info2 |= MAX_PACKET(8); 500 500 break; 501 - case USB_SPEED_VARIABLE: 501 + case USB_SPEED_WIRELESS: 502 502 xhci_dbg(xhci, "FIXME xHCI doesn't support wireless speeds\n"); 503 503 return -EINVAL; 504 504 break;
+1 -1
drivers/usb/wusbcore/devconnect.c
··· 868 868 * reference that we'll drop. 869 869 * 870 870 * First we need to determine if the device is a WUSB device (else we 871 - * ignore it). For that we use the speed setting (USB_SPEED_VARIABLE) 871 + * ignore it). For that we use the speed setting (USB_SPEED_WIRELESS) 872 872 * [FIXME: maybe we'd need something more definitive]. If so, we track 873 873 * it's usb_busd and from there, the WUSB HC. 874 874 *
+1 -1
include/linux/usb/ch9.h
··· 775 775 USB_SPEED_UNKNOWN = 0, /* enumerating */ 776 776 USB_SPEED_LOW, USB_SPEED_FULL, /* usb 1.1 */ 777 777 USB_SPEED_HIGH, /* usb 2.0 */ 778 - USB_SPEED_VARIABLE, /* wireless (usb 2.5) */ 778 + USB_SPEED_WIRELESS, /* wireless (usb 2.5) */ 779 779 USB_SPEED_SUPER, /* usb 3.0 */ 780 780 }; 781 781