Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dd19e69 authored by Viral Mehta's avatar Viral Mehta Committed by Greg Kroah-Hartman
Browse files

USB: xhci: replace if-elseif-else with switch-case 

Replace if-elseif-else with switch-case
to keep the code consistent which is semantically same

Switch-case is used here,
http://www.spinics.net/lists/linux-usb/msg17201.html


Making consistent at other places in usb/core

Also easier to read and maintain when USB4.0, 5.0, ... comes

Signed-off-by: default avatarViral Mehta <viral.mehta@einfochips.com>
Tested-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 527c6d7f

drivers/usb/core/hcd.c

+18 −7
Original line number Diff line number Diff line
@@ -488,28 +488,39 @@ static int rh_call_control (struct usb_hcd *hcd, struct urb *urb) 
	case DeviceRequest | USB_REQ_GET_DESCRIPTOR:

		switch (wValue & 0xff00) {

		case USB_DT_DEVICE << 8:

			if (hcd->driver->flags & HCD_USB3)

			switch (hcd->driver->flags & HCD_MASK) {

			case HCD_USB3:

				bufp = usb3_rh_dev_descriptor;

			else if (hcd->driver->flags & HCD_USB2)

				break;

			case HCD_USB2:

				bufp = usb2_rh_dev_descriptor;

			else if (hcd->driver->flags & HCD_USB11)

				break;

			case HCD_USB11:

				bufp = usb11_rh_dev_descriptor;

			else

				break;

			default:

				goto error;

			}

			len = 18;

			if (hcd->has_tt)

				patch_protocol = 1;

			break;

		case USB_DT_CONFIG << 8:

			if (hcd->driver->flags & HCD_USB3) {

			switch (hcd->driver->flags & HCD_MASK) {

			case HCD_USB3:

				bufp = ss_rh_config_descriptor;

				len = sizeof ss_rh_config_descriptor;

			} else if (hcd->driver->flags & HCD_USB2) {

				break;

			case HCD_USB2:

				bufp = hs_rh_config_descriptor;

				len = sizeof hs_rh_config_descriptor;

			} else {

				break;

			case HCD_USB11:

				bufp = fs_rh_config_descriptor;

				len = sizeof fs_rh_config_descriptor;

				break;

			default:

				goto error;

			}

			if (device_can_wakeup(&hcd->self.root_hub->dev))

				patch_wakeup = 1;