mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-29 01:51:39 +00:00
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: Gustavo A. R. Silva <gustavoars@kernel.org> Link: https://lore.kernel.org/r/20200707195351.GA4061@embeddedor Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
0d9b6d49fe
commit
e288fc9828
4 changed files with 9 additions and 9 deletions
|
@ -385,7 +385,7 @@ sanitize:
|
||||||
ed_free (ohci, ed);
|
ed_free (ohci, ed);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* fall through */
|
fallthrough;
|
||||||
default:
|
default:
|
||||||
/* caller was supposed to have unlinked any requests;
|
/* caller was supposed to have unlinked any requests;
|
||||||
* that's not our job. can't recover; must leak ed.
|
* 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_next = ohci->ed_rm_list;
|
||||||
ed->ed_prev = NULL;
|
ed->ed_prev = NULL;
|
||||||
ohci->ed_rm_list = ed;
|
ohci->ed_rm_list = ed;
|
||||||
/* FALLTHROUGH */
|
fallthrough;
|
||||||
case ED_UNLINK:
|
case ED_UNLINK:
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -58,7 +58,7 @@ __acquires(ohci->lock)
|
||||||
ohci->hc_control |= OHCI_USB_RESET;
|
ohci->hc_control |= OHCI_USB_RESET;
|
||||||
ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
|
ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
|
||||||
(void) ohci_readl (ohci, &ohci->regs->control);
|
(void) ohci_readl (ohci, &ohci->regs->control);
|
||||||
/* FALL THROUGH */
|
fallthrough;
|
||||||
case OHCI_USB_RESET:
|
case OHCI_USB_RESET:
|
||||||
status = -EBUSY;
|
status = -EBUSY;
|
||||||
ohci_dbg (ohci, "needs reinit!\n");
|
ohci_dbg (ohci, "needs reinit!\n");
|
||||||
|
|
|
@ -647,7 +647,7 @@ static void td_submit_urb (
|
||||||
/* ... and periodic urbs have extra accounting */
|
/* ... and periodic urbs have extra accounting */
|
||||||
periodic = ohci_to_hcd(ohci)->self.bandwidth_int_reqs++ == 0
|
periodic = ohci_to_hcd(ohci)->self.bandwidth_int_reqs++ == 0
|
||||||
&& ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0;
|
&& ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0;
|
||||||
/* FALLTHROUGH */
|
fallthrough;
|
||||||
case PIPE_BULK:
|
case PIPE_BULK:
|
||||||
info = is_out
|
info = is_out
|
||||||
? TD_T_TOGGLE | TD_CC | TD_DP_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:
|
case TD_DATAUNDERRUN:
|
||||||
if ((urb->transfer_flags & URB_SHORT_NOT_OK) == 0)
|
if ((urb->transfer_flags & URB_SHORT_NOT_OK) == 0)
|
||||||
break;
|
break;
|
||||||
/* fallthrough */
|
fallthrough;
|
||||||
case TD_CC_STALL:
|
case TD_CC_STALL:
|
||||||
if (usb_pipecontrol (urb->pipe))
|
if (usb_pipecontrol (urb->pipe))
|
||||||
break;
|
break;
|
||||||
/* fallthrough */
|
fallthrough;
|
||||||
default:
|
default:
|
||||||
ohci_dbg (ohci,
|
ohci_dbg (ohci,
|
||||||
"urb %p path %s ep%d%s %08x cc %d --> status %d\n",
|
"urb %p path %s ep%d%s %08x cc %d --> status %d\n",
|
||||||
|
|
|
@ -97,13 +97,13 @@ static void tmio_stop_hc(struct platform_device *dev)
|
||||||
switch (ohci->num_ports) {
|
switch (ohci->num_ports) {
|
||||||
default:
|
default:
|
||||||
dev_err(&dev->dev, "Unsupported amount of ports: %d\n", ohci->num_ports);
|
dev_err(&dev->dev, "Unsupported amount of ports: %d\n", ohci->num_ports);
|
||||||
/* fall through */
|
fallthrough;
|
||||||
case 3:
|
case 3:
|
||||||
pm |= CCR_PM_USBPW3;
|
pm |= CCR_PM_USBPW3;
|
||||||
/* fall through */
|
fallthrough;
|
||||||
case 2:
|
case 2:
|
||||||
pm |= CCR_PM_USBPW2;
|
pm |= CCR_PM_USBPW2;
|
||||||
/* fall through */
|
fallthrough;
|
||||||
case 1:
|
case 1:
|
||||||
pm |= CCR_PM_USBPW1;
|
pm |= CCR_PM_USBPW1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue