Commit 551cdbbe authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 16985408

drivers/staging/usbip/vhci_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static int valid_args(__u32 rhport, enum usb_device_speed speed) 
	case USB_SPEED_LOW:

	case USB_SPEED_FULL:

	case USB_SPEED_HIGH:

	case USB_SPEED_VARIABLE:

	case USB_SPEED_WIRELESS:

		break;

	default:

		usbip_uerr("speed %d\n", speed);

drivers/usb/core/hub.c

+3 −3
Original line number Diff line number Diff line
@@ -1990,7 +1990,7 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1, 
		if (!(portstatus & USB_PORT_STAT_RESET) &&

		    (portstatus & USB_PORT_STAT_ENABLE)) {

			if (hub_is_wusb(hub))

				udev->speed = USB_SPEED_VARIABLE;

				udev->speed = USB_SPEED_WIRELESS;

			else if (portstatus & USB_PORT_STAT_HIGH_SPEED)

				udev->speed = USB_SPEED_HIGH;

			else if (portstatus & USB_PORT_STAT_LOW_SPEED)
@@ -2689,7 +2689,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, 
	 */

	switch (udev->speed) {

	case USB_SPEED_SUPER:

	case USB_SPEED_VARIABLE:	/* fixed at 512 */

	case USB_SPEED_WIRELESS:	/* fixed at 512 */

		udev->ep0.desc.wMaxPacketSize = cpu_to_le16(512);

		break;

	case USB_SPEED_HIGH:		/* fixed at 64 */
@@ -2717,7 +2717,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, 
	case USB_SPEED_SUPER:

				speed = "super";

				break;

	case USB_SPEED_VARIABLE:

	case USB_SPEED_WIRELESS:

				speed = "variable";

				type = "Wireless ";

				break;

drivers/usb/core/sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ show_speed(struct device *dev, struct device_attribute *attr, char *buf) 
	case USB_SPEED_HIGH:

		speed = "480";

		break;

	case USB_SPEED_VARIABLE:

	case USB_SPEED_WIRELESS:

		speed = "480";

		break;

	case USB_SPEED_SUPER:

drivers/usb/core/urb.c

+3 −3
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags) 
	case USB_ENDPOINT_XFER_INT:

		/* too small? */

		switch (dev->speed) {

		case USB_SPEED_VARIABLE:

		case USB_SPEED_WIRELESS:

			if (urb->interval < 6)

				return -EINVAL;

			break;
@@ -453,7 +453,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags) 
			if (urb->interval > (1 << 15))

				return -EINVAL;

			max = 1 << 15;

		case USB_SPEED_VARIABLE:

		case USB_SPEED_WIRELESS:

			if (urb->interval > 16)

				return -EINVAL;

			break;
@@ -480,7 +480,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags) 
		default:

			return -EINVAL;

		}

		if (dev->speed != USB_SPEED_VARIABLE) {

		if (dev->speed != USB_SPEED_WIRELESS) {

			/* Round down to a power of 2, no more than max */

			urb->interval = min(max, 1 << ilog2(urb->interval));

		}

drivers/usb/host/xhci-mem.c

+2 −2
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud 
	case USB_SPEED_LOW:

		slot_ctx->dev_info |= (u32) SLOT_SPEED_LS;

		break;

	case USB_SPEED_VARIABLE:

	case USB_SPEED_WIRELESS:

		xhci_dbg(xhci, "FIXME xHCI doesn't support wireless speeds\n");

		return -EINVAL;

		break;
@@ -498,7 +498,7 @@ int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *ud 
	case USB_SPEED_LOW:

		ep0_ctx->ep_info2 |= MAX_PACKET(8);

		break;

	case USB_SPEED_VARIABLE:

	case USB_SPEED_WIRELESS:

		xhci_dbg(xhci, "FIXME xHCI doesn't support wireless speeds\n");

		return -EINVAL;

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE