usb: Remove unnecessary semicolons

These aren't necessary after switch and if blocks.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

23 files changed, 32 insertions, 32 deletions

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 2159f820b159..2e804a5354c5 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -438,7 +438,7 @@ static void set_port_led(
                         case HUB_LED_OFF: s = "off"; break;
                         case HUB_LED_AUTO: s = "auto"; break;
                         default: s = "??"; break;
-                        }; s; }),
+                        } s; }),
                         status);
 }
 
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 7fa93f4bc507..95f7649c71a7 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -352,7 +352,7 @@ static int dwc3_ep0_handle_status(struct dwc3 *dwc,
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         response_pkt = (__le16 *) dwc->setup_buf;
         *response_pkt = cpu_to_le16(usb_status);
@@ -470,7 +470,7 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc,
 
         default:
                 return -EINVAL;
-        };
+        }
 
         return 0;
 }
@@ -709,7 +709,7 @@ static int dwc3_ep0_std_request(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
                 dev_vdbg(dwc->dev, "Forwarding to gadget driver\n");
                 ret = dwc3_ep0_delegate_req(dwc, ctrl);
                 break;
-        };
+        }
 
         return ret;
 }
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index d4f0f3305759..3e7ae707f691 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -354,7 +354,7 @@ static u8 encode_bMaxPower(enum usb_device_speed speed,
                 return DIV_ROUND_UP(val, 8);
         default:
                 return DIV_ROUND_UP(val, 2);
-        };
+        }
 }
 
 static int config_buf(struct usb_configuration *config,
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index b8a2376971a4..8f4dae310923 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -544,7 +544,7 @@ static int dummy_enable(struct usb_ep *_ep,
                  default:
                          val = "ctrl";
                          break;
-                 }; val; }),
+                 } val; }),
                 max, ep->stream_en ? "enabled" : "disabled");
 
         /* at this point real hardware should be NAKing transfers
@@ -2271,7 +2271,7 @@ static inline ssize_t show_urb(char *buf, size_t size, struct urb *urb)
                 default:
                         s = "?";
                         break;
-                 }; s; }),
+                 } s; }),
                 ep, ep ? (usb_pipein(urb->pipe) ? "in" : "out") : "",
                 ({ char *s; \
                 switch (usb_pipetype(urb->pipe)) { \
@@ -2287,7 +2287,7 @@ static inline ssize_t show_urb(char *buf, size_t size, struct urb *urb)
                 default: \
                         s = "-iso"; \
                         break; \
-                }; s; }),
+                } s; }),
                 urb->actual_length, urb->transfer_buffer_length);
 }
 
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 74bb8df82876..f82768015715 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1165,7 +1165,7 @@ static int udc_proc_read(struct seq_file *m, void *v)
                                 s = "invalid"; break;
                         default:
                                 s = "?"; break;
-                        }; s; }),
+                        } s; }),
                         (tmp & EPxSTATUS_TOGGLE) ? "data1" : "data0",
                         (tmp & EPxSTATUS_SUSPEND) ? " suspend" : "",
                         (tmp & EPxSTATUS_FIFO_DISABLE) ? " disable" : "",
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 9fbc8fe5ecc0..fc852177c087 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -129,7 +129,7 @@ static char *type_string (u8 bmAttributes)
         case USB_ENDPOINT_XFER_BULK:    return "bulk";
         case USB_ENDPOINT_XFER_ISOC:    return "iso";
         case USB_ENDPOINT_XFER_INT:     return "intr";
-        };
+        }
         return "control";
 }
 #endif
@@ -1630,7 +1630,7 @@ static ssize_t queues_show(struct device *_dev, struct device_attribute *attr,
                                         val = "intr"; break;
                                  default:
                                         val = "iso"; break;
-                                 }; val; }),
+                                 } val; }),
                                 usb_endpoint_maxp (d) & 0x1fff,
                                 ep->dma ? "dma" : "pio", ep->fifo_size
                                 );
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 9575085ded81..a3ad732bc812 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -1068,7 +1068,7 @@ static int rndis_proc_show(struct seq_file *m, void *v)
                                 s = "RNDIS_INITIALIZED"; break;
                          case RNDIS_DATA_INITIALIZED:
                                 s = "RNDIS_DATA_INITIALIZED"; break;
-                        }; s; }),
+                        } s; }),
                          param->medium,
                          (param->media_state) ? 0 : param->speed*100,
                          (param->media_state) ? "disconnected" : "connected",
diff --git a/drivers/usb/gadget/tcm_usb_gadget.c b/drivers/usb/gadget/tcm_usb_gadget.c
index 0ff33396eef3..eccea1df702d 100644
--- a/drivers/usb/gadget/tcm_usb_gadget.c
+++ b/drivers/usb/gadget/tcm_usb_gadget.c
@@ -472,7 +472,7 @@ static int usbg_bot_setup(struct usb_function *f,
                 bot_enqueue_cmd_cbw(fu);
                 return 0;
                 break;
-        };
+        }
         return -ENOTSUPP;
 }
 
@@ -617,7 +617,7 @@ static void uasp_status_data_cmpl(struct usb_ep *ep, struct usb_request *req)
 
         default:
                 BUG();
-        };
+        }
         return;
 
 cleanup:
diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index aa5b603f3933..da7d7fcccb8a 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -379,7 +379,7 @@ struct debug_buffer {
                 case QH_LOW_SPEED:  tmp = 'l'; break; \
                 case QH_HIGH_SPEED: tmp = 'h'; break; \
                 default: tmp = '?'; break; \
-                }; tmp; })
+                } tmp; })
 
 static inline char token_mark(struct ehci_hcd *ehci, __hc32 token)
 {
diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c
index fce13bcc4a3e..55486bd23cf1 100644
--- a/drivers/usb/host/fotg210-hcd.c
+++ b/drivers/usb/host/fotg210-hcd.c
@@ -412,7 +412,7 @@ struct debug_buffer {
                         tmp = 'h'; break; \
                 default:                \
                         tmp = '?'; break; \
-                }; tmp; })
+                } tmp; })
 
 static inline char token_mark(struct fotg210_hcd *fotg210, __hc32 token)
 {
diff --git a/drivers/usb/host/fusbh200-hcd.c b/drivers/usb/host/fusbh200-hcd.c
index 299253c826c7..e1c6d850a7e1 100644
--- a/drivers/usb/host/fusbh200-hcd.c
+++ b/drivers/usb/host/fusbh200-hcd.c
@@ -402,7 +402,7 @@ struct debug_buffer {
                 case QH_LOW_SPEED:  tmp = 'l'; break; \
                 case QH_HIGH_SPEED: tmp = 'h'; break; \
                 default: tmp = '?'; break; \
-                }; tmp; })
+                } tmp; })
 
 static inline char token_mark(struct fusbh200_hcd *fusbh200, __hc32 token)
 {
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 6f29abad6815..935a2dd367a8 100644
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -2108,7 +2108,7 @@ static int isp1362_show(struct seq_file *s, void *unused)
                                    default:
                                            s = "?";
                                            break;
-                                   };
+                                   }
                                    s;}), ep->maxpacket) ;
                 list_for_each_entry(urb, &ep->hep->urb_list, urb_list) {
                         seq_printf(s, "  urb%p, %d/%d\n", urb,
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index 31b81f9eacdc..3fca52ec02ac 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -17,7 +17,7 @@
         case PIPE_BULK:         temp = "bulk"; break; \
         case PIPE_INTERRUPT:    temp = "intr"; break; \
         default:                temp = "isoc"; break; \
-        }; temp;})
+        } temp;})
 #define pipestring(pipe) edstring(usb_pipetype(pipe))
 
 /* debug| print the main components of an URB
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 5477bf5df218..79620c39217e 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1413,7 +1413,7 @@ static int sl811h_show(struct seq_file *s, void *unused)
                         case SL11H_CTL1MASK_SE0: s = " se0/reset"; break;
                         case SL11H_CTL1MASK_K: s = " k/resume"; break;
                         default: s = "j"; break;
-                        }; s; }),
+                        } s; }),
                         (t & SL11H_CTL1MASK_LSPD) ? " lowspeed" : "",
                         (t & SL11H_CTL1MASK_SUSPEND) ? " suspend" : "");
 
@@ -1446,7 +1446,7 @@ static int sl811h_show(struct seq_file *s, void *unused)
                         case USB_PID_SETUP: s = "setup"; break;
                         case USB_PID_ACK: s = "status"; break;
                         default: s = "?"; break;
-                        }; s;}),
+                        } s;}),
                         ep->maxpacket,
                         ep->nak_count, ep->error_count);
                 list_for_each_entry (urb, &ep->hep->urb_list, urb_list) {
diff --git a/drivers/usb/host/uhci-pci.c b/drivers/usb/host/uhci-pci.c
index d89c78dc70c0..8de0da0e6dfc 100644
--- a/drivers/usb/host/uhci-pci.c
+++ b/drivers/usb/host/uhci-pci.c
@@ -178,7 +178,7 @@ static int uhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
                 dev_warn(uhci_dev(uhci), "Root hub isn't suspended!\n");
                 rc = -EBUSY;
                 goto done;
-        };
+        }
 
         /* All PCI host controllers are required to disable IRQ generation
          * at the source, so we must turn off PIRQ.
diff --git a/drivers/usb/host/whci/hcd.c b/drivers/usb/host/whci/hcd.c
index ecc88db804e0..1b0888f8da9a 100644
--- a/drivers/usb/host/whci/hcd.c
+++ b/drivers/usb/host/whci/hcd.c
@@ -134,7 +134,7 @@ static int whc_urb_enqueue(struct usb_hcd *usb_hcd, struct urb *urb,
         default:
                 ret = asl_urb_enqueue(whc, urb, mem_flags);
                 break;
-        };
+        }
 
         return ret;
 }
@@ -160,7 +160,7 @@ static int whc_urb_dequeue(struct usb_hcd *usb_hcd, struct urb *urb, int status)
         default:
                 ret = asl_urb_dequeue(whc, urb, status);
                 break;
-        };
+        }
 
         return ret;
 }
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 18e877ffe7b7..093982a2eef0 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -617,7 +617,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
                                 /* case 3 << MUSB_DEVCTL_VBUS_SHIFT: */
                                 default:
                                         s = "VALID"; break;
-                                }; s; }),
+                                } s; }),
                                 VBUSERR_RETRY_COUNT - musb->vbuserr_retry,
                                 musb->port1_status);
 
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index bd4138d80a48..1a5574c2d586 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -443,7 +443,7 @@ static int get_musb_port_mode(struct device *dev)
         case USB_DR_MODE_OTG:
         default:
                 return MUSB_PORT_MODE_DUAL_ROLE;
-        };
+        }
 }
 
 static int dsps_create_musb_pdev(struct dsps_glue *glue,
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index b19ed213ab85..b80669871b04 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1121,7 +1121,7 @@ static int musb_gadget_enable(struct usb_ep *ep,
                         case USB_ENDPOINT_XFER_BULK:    s = "bulk"; break;
                         case USB_ENDPOINT_XFER_INT:     s = "int"; break;
                         default:                        s = "iso"; break;
-                        }; s; }),
+                        } s; }),
                         musb_ep->is_in ? "IN" : "OUT",
                         musb_ep->dma ? "dma, " : "",
                         musb_ep->packet_sz);
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 9a2b8c85f19a..6582a20bec05 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -253,7 +253,7 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)
                         case USB_ENDPOINT_XFER_BULK:    s = "-bulk"; break;
                         case USB_ENDPOINT_XFER_ISOC:    s = "-iso"; break;
                         default:                        s = "-intr"; break;
-                        }; s; }),
+                        } s; }),
                         epnum, buf + offset, len);
 
         /* Configure endpoint */
diff --git a/drivers/usb/phy/phy-ulpi-viewport.c b/drivers/usb/phy/phy-ulpi-viewport.c
index 7c22a5390fc3..18bb8264b5a0 100644
--- a/drivers/usb/phy/phy-ulpi-viewport.c
+++ b/drivers/usb/phy/phy-ulpi-viewport.c
@@ -36,7 +36,7 @@ static int ulpi_viewport_wait(void __iomem *view, u32 mask)
                         return 0;
 
                 udelay(1);
-        };
+        }
 
         return -ETIMEDOUT;
 }
diff --git a/drivers/usb/wusbcore/cbaf.c b/drivers/usb/wusbcore/cbaf.c
index 7f78f300f8fb..010f99087506 100644
--- a/drivers/usb/wusbcore/cbaf.c
+++ b/drivers/usb/wusbcore/cbaf.c
@@ -208,9 +208,9 @@ static int cbaf_check(struct cbaf *cbaf)
                                 ar_name = "ASSOCIATE";
                                 ar_assoc = 1;
                                 break;
-                        };
+                        }
                         break;
-                };
+                }
 
                 dev_dbg(dev, "Association request #%02u: 0x%04x/%04x "
                          "(%zu bytes): %s\n",
diff --git a/drivers/usb/wusbcore/devconnect.c b/drivers/usb/wusbcore/devconnect.c
index 33a12788f9ca..e538b72c4e3a 100644
--- a/drivers/usb/wusbcore/devconnect.c
+++ b/drivers/usb/wusbcore/devconnect.c
@@ -973,7 +973,7 @@ int wusb_usb_ncb(struct notifier_block *nb, unsigned long val,
         default:
                 WARN_ON(1);
                 result = NOTIFY_BAD;
-        };
+        }
         return result;
 }