Commit 1d6903a6 authored by Nick Desaulniers's avatar Nick Desaulniers Committed by Greg Kroah-Hartman
Browse files

usb: fix a few cases of -Wfallthrough 



The "fallthrough" pseudo-keyword was added as a portable way to denote
intentional fallthrough. Clang will still warn on cases where there is a
fallthrough to an immediate break. Add explicit breaks for those cases.

Reviewed-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Signed-off-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Link: https://lore.kernel.org/r/20201111014716.260633-1-ndesaulniers@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 57cde551

drivers/usb/core/config.c

+1 −0
Original line number Diff line number Diff line
@@ -1076,6 +1076,7 @@ int usb_get_bos_descriptor(struct usb_device *dev) 
		case USB_PTM_CAP_TYPE:

			dev->bos->ptm_cap =

				(struct usb_ptm_cap_descriptor *)buffer;

			break;

		default:

			break;

		}

drivers/usb/host/ehci-hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ static int ehci_urb_enqueue ( 
		 */

		if (urb->transfer_buffer_length > (16 * 1024))

			return -EMSGSIZE;

		/* FALLTHROUGH */

		fallthrough;

	/* case PIPE_BULK: */

	default:

		if (!qh_urb_transaction (ehci, urb, &qtd_list, mem_flags))

drivers/usb/host/ohci-hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int ohci_urb_enqueue ( 


			/* 1 TD for setup, 1 for ACK, plus ... */

			size = 2;

			/* FALLTHROUGH */

			fallthrough;

		// case PIPE_INTERRUPT:

		// case PIPE_BULK:

		default:

drivers/usb/host/ohci-hub.c

+1 −0
Original line number Diff line number Diff line
@@ -692,6 +692,7 @@ int ohci_hub_control( 
		case C_HUB_OVER_CURRENT:

			ohci_writel (ohci, RH_HS_OCIC,

					&ohci->regs->roothub.status);

			break;

		case C_HUB_LOCAL_POWER:

			break;

		default:

drivers/usb/host/xhci-ring.c

+2 −0
Original line number Diff line number Diff line
@@ -2418,6 +2418,7 @@ static int handle_tx_event(struct xhci_hcd *xhci, 
			xhci_warn_ratelimited(xhci,

					      "WARN Successful completion on short TX for slot %u ep %u: needs XHCI_TRUST_TX_LENGTH quirk?\n",

					      slot_id, ep_index);

		break;

	case COMP_SHORT_PACKET:

		break;

	/* Completion codes for endpoint stopped state */
@@ -2962,6 +2963,7 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring, 
		return -EINVAL;

	case EP_STATE_HALTED:

		xhci_dbg(xhci, "WARN halted endpoint, queueing URB anyway.\n");

		break;

	case EP_STATE_STOPPED:

	case EP_STATE_RUNNING:

		break;