Commit a74005ab authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Greg Kroah-Hartman
Browse files

usb: gadget: Use fallthrough pseudo-keyword 

Replace the existing /* fall through */ comments and its variants with
the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary
fall-through markings when it is the case.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through



Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20200707171500.GA13620@embeddedor


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

drivers/usb/gadget/composite.c

+8 −8
Original line number Diff line number Diff line
@@ -72,17 +72,17 @@ function_descriptors(struct usb_function *f, 
		descriptors = f->ssp_descriptors;

		if (descriptors)

			break;

		/* FALLTHROUGH */

		fallthrough;

	case USB_SPEED_SUPER:

		descriptors = f->ss_descriptors;

		if (descriptors)

			break;

		/* FALLTHROUGH */

		fallthrough;

	case USB_SPEED_HIGH:

		descriptors = f->hs_descriptors;

		if (descriptors)

			break;

		/* FALLTHROUGH */

		fallthrough;

	default:

		descriptors = f->fs_descriptors;

	}
@@ -170,20 +170,20 @@ int config_ep_by_speed_and_alt(struct usb_gadget *g, 
			want_comp_desc = 1;

			break;

		}

		/* fall through */

		fallthrough;

	case USB_SPEED_SUPER:

		if (gadget_is_superspeed(g)) {

			speed_desc = f->ss_descriptors;

			want_comp_desc = 1;

			break;

		}

		/* fall through */

		fallthrough;

	case USB_SPEED_HIGH:

		if (gadget_is_dualspeed(g)) {

			speed_desc = f->hs_descriptors;

			break;

		}

		/* fall through */

		fallthrough;

	default:

		speed_desc = f->fs_descriptors;

	}
@@ -237,7 +237,7 @@ ep_found: 
		case USB_ENDPOINT_XFER_ISOC:

			/* mult: bits 1:0 of bmAttributes */

			_ep->mult = (comp_desc->bmAttributes & 0x3) + 1;

			/* fall through */

			fallthrough;

		case USB_ENDPOINT_XFER_BULK:

		case USB_ENDPOINT_XFER_INT:

			_ep->maxburst = comp_desc->bMaxBurst + 1;
@@ -1697,7 +1697,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
			if (!gadget_is_dualspeed(gadget) ||

			    gadget->speed >= USB_SPEED_SUPER)

				break;

			/* FALLTHROUGH */

			fallthrough;

		case USB_DT_CONFIG:

			value = config_desc(cdev, w_value);

			if (value >= 0)

drivers/usb/gadget/function/f_fs.c

+1 −1
Original line number Diff line number Diff line
@@ -2726,7 +2726,7 @@ static void __ffs_event_add(struct ffs_data *ffs, 
	switch (type) {

	case FUNCTIONFS_RESUME:

		rem_type2 = FUNCTIONFS_SUSPEND;

		/* FALL THROUGH */

		fallthrough;

	case FUNCTIONFS_SUSPEND:

	case FUNCTIONFS_SETUP:

		rem_type1 = type;

drivers/usb/gadget/function/f_hid.c

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ static void hidg_set_report_complete(struct usb_ep *ep, struct usb_request *req) 
		break;

	default:

		ERROR(cdev, "Set report failed %d\n", req->status);

		/* FALLTHROUGH */

		fallthrough;

	case -ECONNABORTED:		/* hardware forced ep reset */

	case -ECONNRESET:		/* request dequeued */

	case -ESHUTDOWN:		/* disconnect from host */

drivers/usb/gadget/function/f_mass_storage.c

+1 −1
Original line number Diff line number Diff line
@@ -2039,7 +2039,7 @@ static int do_scsi_command(struct fsg_common *common) 
	case RELEASE:

	case RESERVE:

	case SEND_DIAGNOSTIC:

		/* Fall through */

		fallthrough;



	default:

unknown_cmnd:

drivers/usb/gadget/function/f_phonet.c

+2 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static void pn_tx_complete(struct usb_ep *ep, struct usb_request *req) 
	case -ESHUTDOWN: /* disconnected */

	case -ECONNRESET: /* disabled */

		dev->stats.tx_aborted_errors++;

		/* fall through */

		fallthrough;

	default:

		dev->stats.tx_errors++;

	}
@@ -360,7 +360,7 @@ static void pn_rx_complete(struct usb_ep *ep, struct usb_request *req) 
	/* Do resubmit in these cases: */

	case -EOVERFLOW: /* request buffer overflow */

		dev->stats.rx_over_errors++;

		/* fall through */

		fallthrough;

	default:

		dev->stats.rx_errors++;

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE