]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
usb: gadget: composite: mark expected switch fall-throughs
authorGustavo A. R. Silva <garsilva@embeddedor.com>
Wed, 25 Oct 2017 17:22:50 +0000 (12:22 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 1 Nov 2017 15:57:22 +0000 (16:57 +0100)
In preparation to enabling -Wimplicit-fallthrough, mark switch cases
where we are expecting to fall through.

Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/composite.c

index 5d061b3d8224aaa0b0a88c5c700454d8256b25bc..1f1ab6fa3f9d48863413b2555fd197e293666217 100644 (file)
@@ -170,20 +170,20 @@ int config_ep_by_speed(struct usb_gadget *g,
                        want_comp_desc = 1;
                        break;
                }
-               /* else: Fall trough */
+               /* fall through */
        case USB_SPEED_SUPER:
                if (gadget_is_superspeed(g)) {
                        speed_desc = f->ss_descriptors;
                        want_comp_desc = 1;
                        break;
                }
-               /* else: Fall trough */
+               /* fall through */
        case USB_SPEED_HIGH:
                if (gadget_is_dualspeed(g)) {
                        speed_desc = f->hs_descriptors;
                        break;
                }
-               /* else: fall through */
+               /* fall through */
        default:
                speed_desc = f->fs_descriptors;
        }
@@ -224,6 +224,7 @@ int config_ep_by_speed(struct usb_gadget *g,
                case USB_ENDPOINT_XFER_ISOC:
                        /* mult: bits 1:0 of bmAttributes */
                        _ep->mult = (comp_desc->bmAttributes & 0x3) + 1;
+                       /* fall through */
                case USB_ENDPOINT_XFER_BULK:
                case USB_ENDPOINT_XFER_INT:
                        _ep->maxburst = comp_desc->bMaxBurst + 1;