usb: Fix fall-through warnings for Clang

In preparation to enable -Wimplicit-fallthrough for Clang, fix multiple
warnings by explicitly adding multiple break/return/fallthrough
statements instead of letting the code fall through to the next
case.

Link: https://github.com/KSPP/linux/issues/115
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/a76da7ca5b4f41c13d27b298accb8222d0b04e61.1605896060.git.gustavoars@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 046f770a76dae1cd0d40cb028ae950bd797287d2..7f9c4e35d3dbce3259a8044e9525860dbd840763 100644 (file)
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -678,6 +678,8 @@ static __poll_t ffs_ep0_poll(struct file *file, poll_table *wait)
                        mask |= (EPOLLIN | EPOLLOUT);
                        break;
                }
+               break;
+
        case FFS_CLOSING:
                break;
        case FFS_DEACTIVATED:

diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c
index 1803646b367805facd3b1e0f37a870cb8603ff61..b56ad7c3838b86d191842a75408c8da060a00f96 100644 (file)
--- a/drivers/usb/gadget/function/f_loopback.c
+++ b/drivers/usb/gadget/function/f_loopback.c
@@ -274,7 +274,7 @@ static void loopback_complete(struct usb_ep *ep, struct usb_request *req)
        default:
                ERROR(cdev, "%s loop complete --> %d, %d/%d\n", ep->name,
                                status, req->actual, req->length);
-               /* FALLTHROUGH */
+               fallthrough;
 
        /* NOTE:  since this driver doesn't maintain an explicit record
         * of requests it submitted (just maintains qlen count), we

diff --git a/drivers/usb/gadget/function/f_sourcesink.c b/drivers/usb/gadget/function/f_sourcesink.c
index ed68a4860b7d8702e1a8fd9cca40b04b5065a4ce..5a201ba7b155bb2bd7dbc083ce662319d4641975 100644 (file)
--- a/drivers/usb/gadget/function/f_sourcesink.c
+++ b/drivers/usb/gadget/function/f_sourcesink.c
@@ -559,6 +559,7 @@ static void source_sink_complete(struct usb_ep *ep, struct usb_request *req)
 #if 1
                DBG(cdev, "%s complete --> %d, %d/%d\n", ep->name,
                                status, req->actual, req->length);
+               break;
 #endif
        case -EREMOTEIO:                /* short read */
                break;

diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c
index 1dde016ca86f7979d1110fe55da309f11ed1eafd..f6b40777817989839ad74dcd39fa2ddb718983cd 100644 (file)
--- a/drivers/usb/gadget/udc/dummy_hcd.c
+++ b/drivers/usb/gadget/udc/dummy_hcd.c
@@ -553,6 +553,7 @@ static int dummy_enable(struct usb_ep *_ep,
                                /* we'll fake any legal size */
                                break;
                        /* save a return statement */
+                       fallthrough;
                default:
                        goto done;
                }
@@ -595,6 +596,7 @@ static int dummy_enable(struct usb_ep *_ep,
                        if (max <= 1023)
                                break;
                        /* save a return statement */
+                       fallthrough;
                default:
                        goto done;
                }

diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c
index 1d94fcfac2c281e1955313efe01356d1af762094..0451943f0bc402b216843cc726c73a1af8c34cd9 100644 (file)
--- a/drivers/usb/host/fotg210-hcd.c
+++ b/drivers/usb/host/fotg210-hcd.c
@@ -5276,7 +5276,7 @@ static int fotg210_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
                 */
                if (urb->transfer_buffer_length > (16 * 1024))
                        return -EMSGSIZE;
-               /* FALLTHROUGH */
+               fallthrough;
        /* case PIPE_BULK: */
        default:
                if (!qh_urb_transaction(fotg210, urb, &qtd_list, mem_flags))

diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 3055d9abfec302c5c931025b5bfa5b2c0d1afc7b..8544a2a2c1e6a0c42d4ae8dde24a4e40553126f0 100644 (file)
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -1447,6 +1447,7 @@ static int isp116x_bus_resume(struct usb_hcd *hcd)
                val &= ~HCCONTROL_HCFS;
                val |= HCCONTROL_USB_RESUME;
                isp116x_write_reg32(isp116x, HCCONTROL, val);
+               break;
        case HCCONTROL_USB_RESUME:
                break;
        case HCCONTROL_USB_OPER:

diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c
index ebb8180b52ab17b067493b1d071e726029bfdc36..afd9174d83b148d9368ca3dee50d6374fc654bf9 100644 (file)
--- a/drivers/usb/host/max3421-hcd.c
+++ b/drivers/usb/host/max3421-hcd.c
@@ -1537,6 +1537,7 @@ max3421_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags)
                                __func__, urb->interval);
                        return -EINVAL;
                }
+               break;
        default:
                break;
        }

diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index 27dbbe1b28b12cc341e668f320fb7f467277d8bb..aa42df39e6a18140034feff7a9aab93a2ba8dd94 100644 (file)
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -1365,6 +1365,7 @@ __acquires(oxu->lock)
        switch (urb->status) {
        case -EINPROGRESS:              /* success */
                urb->status = 0;
+               break;
        default:                        /* fault */
                break;
        case -EREMOTEIO:                /* fault or normal */

diff --git a/drivers/usb/misc/yurex.c b/drivers/usb/misc/yurex.c
index e3165d79b5f6410a66c46085dabc35d74048090b..73ebfa6e9715e336c805f3330986eb9a2ad3c802 100644 (file)
--- a/drivers/usb/misc/yurex.c
+++ b/drivers/usb/misc/yurex.c
@@ -137,6 +137,7 @@ static void yurex_interrupt(struct urb *urb)
                dev_err(&dev->interface->dev,
                        "%s - overflow with length %d, actual length is %d\n",
                        __func__, YUREX_BUF_SIZE, dev->urb->actual_length);
+               return;
        case -ECONNRESET:
        case -ENOENT:
        case -ESHUTDOWN:

diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index c26683a2702b65ad542588cb16cad5cd7e186137..c4293769220793bc8ddab886bb8d82bdd0c854fe 100644 (file)
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -467,6 +467,7 @@ static void musb_do_idle(struct timer_list *t)
                fallthrough;
        case OTG_STATE_A_IDLE:
                tusb_musb_set_vbus(musb, 0);
+               break;
        default:
                break;
        }

diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c
index 98c1aa594e6c4d58e568366b106746c4dbf81599..5f7d678502be457a5f462f8fc0d7c8319711a00c 100644 (file)
--- a/drivers/usb/storage/ene_ub6250.c
+++ b/drivers/usb/storage/ene_ub6250.c
@@ -861,6 +861,7 @@ static int ms_count_freeblock(struct us_data *us, u16 PhyBlock)
                case MS_LB_NOT_USED:
                case MS_LB_NOT_USED_ERASED:
                        Count++;
+                       break;
                default:
                        break;
                }

diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index c8a577309e8fbe027a103effdd9f01e156a8ca17..6bd33c57fdcba3d804e137185c5ec934d1d74681 100644 (file)
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -690,6 +690,7 @@ static int uas_queuecommand_lck(struct scsi_cmnd *cmnd,
                fallthrough;
        case DMA_TO_DEVICE:
                cmdinfo->state |= ALLOC_DATA_OUT_URB | SUBMIT_DATA_OUT_URB;
+               break;
        case DMA_NONE:
                break;
        }