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

USB: OHCI: 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/20200707195351.GA4061@embeddedor


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

drivers/usb/host/ohci-hcd.c

+2 −2
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ sanitize: 
			ed_free (ohci, ed);

			break;

		}

		/* fall through */

		fallthrough;

	default:

		/* caller was supposed to have unlinked any requests;

		 * that's not our job.  can't recover; must leak ed.
@@ -1051,7 +1051,7 @@ int ohci_restart(struct ohci_hcd *ohci) 
			ed->ed_next = ohci->ed_rm_list;

			ed->ed_prev = NULL;

			ohci->ed_rm_list = ed;

			/* FALLTHROUGH */

			fallthrough;

		case ED_UNLINK:

			break;

		default:

drivers/usb/host/ohci-hub.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ __acquires(ohci->lock) 
		ohci->hc_control |= OHCI_USB_RESET;

		ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);

		(void) ohci_readl (ohci, &ohci->regs->control);

		/* FALL THROUGH */

		fallthrough;

	case OHCI_USB_RESET:

		status = -EBUSY;

		ohci_dbg (ohci, "needs reinit!\n");

drivers/usb/host/ohci-q.c

+3 −3
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static void td_submit_urb ( 
		/* ... and periodic urbs have extra accounting */

		periodic = ohci_to_hcd(ohci)->self.bandwidth_int_reqs++ == 0

			&& ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0;

		/* FALLTHROUGH */

		fallthrough;

	case PIPE_BULK:

		info = is_out

			? TD_T_TOGGLE | TD_CC | TD_DP_OUT
@@ -879,11 +879,11 @@ static void ed_halted(struct ohci_hcd *ohci, struct td *td, int cc) 
	case TD_DATAUNDERRUN:

		if ((urb->transfer_flags & URB_SHORT_NOT_OK) == 0)

			break;

		/* fallthrough */

		fallthrough;

	case TD_CC_STALL:

		if (usb_pipecontrol (urb->pipe))

			break;

		/* fallthrough */

		fallthrough;

	default:

		ohci_dbg (ohci,

			"urb %p path %s ep%d%s %08x cc %d --> status %d\n",

drivers/usb/host/ohci-tmio.c

+3 −3
Original line number Diff line number Diff line
@@ -97,13 +97,13 @@ static void tmio_stop_hc(struct platform_device *dev) 
	switch (ohci->num_ports) {

		default:

			dev_err(&dev->dev, "Unsupported amount of ports: %d\n", ohci->num_ports);

			/* fall through */

			fallthrough;

		case 3:

			pm |= CCR_PM_USBPW3;

			/* fall through */

			fallthrough;

		case 2:

			pm |= CCR_PM_USBPW2;

			/* fall through */

			fallthrough;

		case 1:

			pm |= CCR_PM_USBPW1;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE