16 files changed, 26 insertions, 26 deletions

diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index 36722ed6b53..1c7c159fdc3 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -4230,7 +4230,7 @@ skip_key:
             default:
                 A_PRINTF("AUTH: Unknown\n");
                 break;
-        };
+        }
         switch (listenInterval&0xFF) {
             case WPA_PSK_AUTH:
                 A_PRINTF("KeyMgmt: WPA-PSK\n");
@@ -4241,7 +4241,7 @@ skip_key:
             default:
                 A_PRINTF("KeyMgmt: NONE\n");
                 break;
-        };
+        }
         switch (beaconInterval) {
             case AES_CRYPT:
                 A_PRINTF("Cipher: AES\n");
@@ -4260,7 +4260,7 @@ skip_key:
             default:
                 A_PRINTF("Cipher: NONE\n");
                 break;
-        };
+        }
 
         add_new_sta(ar, bssid, channel /*aid*/,
             assocInfo /* WPA IE */, assocRespLen /* IE len */,
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 632d5d0721c..08b71d9974b 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -1417,7 +1417,7 @@ static int pci9118_ai_docmd_sampl(struct comedi_device *dev,
                 comedi_error(dev,
                              "pci9118_ai_docmd_sampl() mode number bug!\n");
                 return -EIO;
-        };
+        }
 
         devpriv->int_ai_func = interrupt_pci9118_ai_onesample;
                                                 /* transfer function */
@@ -1496,7 +1496,7 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,
         default:
                 comedi_error(dev, "pci9118_ai_docmd_dma() mode number bug!\n");
                 return -EIO;
-        };
+        }
 
         if (devpriv->ai12_startstop) {
                 pci9118_exttrg_add(dev, EXTTRG_AI);
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index 6383fc93b83..49102b3a6c4 100644
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -650,7 +650,7 @@ static int cb_pcidda_ao_winsn(struct comedi_device *dev,
         case 5:
                 command |= UNIP | RANGE2V5;
                 break;
-        };
+        }
 
         /* output channel specification */
         command |= channel << 2;
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index 3d53df000cf..b1b832b65bc 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -264,7 +264,7 @@ found:
         default:
                 printk("THIS CARD IS UNSUPPORTED.\n"
                        "PLEASE REPORT USAGE TO <mocelet@sucs.org>\n");
-        };
+        }
 
         if (comedi_pci_enable(pcidev, "cb_pcimdas")) {
                 printk(" Failed to enable PCI device and request regions\n");
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index ca2aeaa9449..35f3a474982 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -1418,7 +1418,7 @@ static int ni_660x_dio_insn_config(struct comedi_device *dev,
         default:
                 return -EINVAL;
                 break;
-        };
+        }
         return 0;
 }
 
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index 986ef671298..fd232bc5f87 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -1627,7 +1627,7 @@ static int ni_ai_setup_MITE_dma(struct comedi_device *dev)
         default:
                 mite_prep_dma(devpriv->ai_mite_chan, 16, 16);
                 break;
-        };
+        }
         /*start the MITE */
         mite_dma_arm(devpriv->ai_mite_chan);
         spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
@@ -2156,7 +2156,7 @@ static unsigned ni_min_ai_scan_period_ns(struct comedi_device *dev,
         default:
                 /*  multiplexed inputs */
                 break;
-        };
+        }
         return boardtype.ai_speed * num_channels;
 }
 
@@ -5173,7 +5173,7 @@ static void GPCT_Reset(struct comedi_device *dev, int chan)
                 devpriv->stc_writew(dev, devpriv->an_trig_etc_reg,
                                     Analog_Trigger_Etc_Register);
                 break;
-        };
+        }
 
         devpriv->gpct_mode[chan] = 0;
         devpriv->gpct_input_select[chan] = 0;
diff --git a/drivers/staging/comedi/drivers/ni_tio.c b/drivers/staging/comedi/drivers/ni_tio.c
index a9bb6b13dfc..98f87897e2a 100644
--- a/drivers/staging/comedi/drivers/ni_tio.c
+++ b/drivers/staging/comedi/drivers/ni_tio.c
@@ -1181,7 +1181,7 @@ static int ni_660x_set_second_gate(struct ni_gpct *counter,
                         break;
                 return -EINVAL;
                 break;
-        };
+        }
         counter_dev->regs[second_gate_reg] |= Gi_Second_Gate_Mode_Bit;
         counter_dev->regs[second_gate_reg] &= ~Gi_Second_Gate_Select_Mask;
         counter_dev->regs[second_gate_reg] |=
@@ -1209,7 +1209,7 @@ static int ni_m_series_set_second_gate(struct ni_gpct *counter,
                 ni_m_series_second_gate_select =
                     selected_second_gate & selected_second_gate_mask;
                 break;
-        };
+        }
         counter_dev->regs[second_gate_reg] |= Gi_Second_Gate_Mode_Bit;
         counter_dev->regs[second_gate_reg] &= ~Gi_Second_Gate_Select_Mask;
         counter_dev->regs[second_gate_reg] |=
@@ -1674,7 +1674,7 @@ int ni_tio_rinsn(struct ni_gpct *counter, struct comedi_insn *insn,
                     counter_dev->
                     regs[NITIO_Gi_LoadB_Reg(counter->counter_index)];
                 break;
-        };
+        }
         return 0;
 }
 EXPORT_SYMBOL_GPL(ni_tio_rinsn);
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
index e3eea09ae1f..8933e5089bd 100644
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -1662,7 +1662,7 @@ static void rtc_dropped_irq(unsigned long data)
                 tmp = (CMOS_READ(RTC_INTR_FLAGS) & 0xF0);       /* restart */
                 restore_flags(flags);
                 break;
-        };
+        }
 }
 
 /*
diff --git a/drivers/staging/crystalhd/crystalhd_misc.c b/drivers/staging/crystalhd/crystalhd_misc.c
index 2c5138e4e1b..5fa0c6e10ce 100644
--- a/drivers/staging/crystalhd/crystalhd_misc.c
+++ b/drivers/staging/crystalhd/crystalhd_misc.c
@@ -311,7 +311,7 @@ enum BC_STATUS crystalhd_pci_cfg_rd(struct crystalhd_adp *adp, uint32_t off,
                 rc = -EINVAL;
                 sts = BC_STS_INV_ARG;
                 BCMLOG_ERR("Invalid len:%d\n", len);
-        };
+        }
 
         if (rc && (sts == BC_STS_SUCCESS))
                 sts = BC_STS_ERROR;
@@ -356,7 +356,7 @@ enum BC_STATUS crystalhd_pci_cfg_wr(struct crystalhd_adp *adp, uint32_t off,
                 rc = -EINVAL;
                 sts = BC_STS_INV_ARG;
                 BCMLOG_ERR("Invalid len:%d\n", len);
-        };
+        }
 
         if (rc && (sts == BC_STS_SUCCESS))
                 sts = BC_STS_ERROR;
diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/staging/cx25821/cx25821-video.c
index 04b18f4d98f..7a0304a8573 100644
--- a/drivers/staging/cx25821/cx25821-video.c
+++ b/drivers/staging/cx25821/cx25821-video.c
@@ -1574,7 +1574,7 @@ int cx25821_set_control(struct cx25821_dev *dev,
                 break;
         default:
                 /* nothing */ ;
-        };
+        }
 
         switch (ctl->id) {
         case V4L2_CID_BRIGHTNESS:
diff --git a/drivers/staging/hv/hv_util.c b/drivers/staging/hv/hv_util.c
index 8038589e2c0..ea76ddaa5fc 100644
--- a/drivers/staging/hv/hv_util.c
+++ b/drivers/staging/hv/hv_util.c
@@ -88,7 +88,7 @@ static void shutdown_onchannelcallback(void *context)
                                 pr_info("Shutdown request received -"
                                             " Invalid request\n");
                                 break;
-                        };
+                        }
                 }
 
                 icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index 3067f9662d2..34f16a7cc3a 100644
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -399,7 +399,7 @@ static ssize_t lis3l02dq_write_frequency(struct device *dev,
         default:
                 ret = -EINVAL;
                 goto error_ret_mutex;
-        };
+        }
 
         ret = lis3l02dq_spi_write_reg_8(dev,
                                         LIS3L02DQ_REG_CTRL_1_ADDR,
diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c
index d1b5b13629d..9b25f120544 100644
--- a/drivers/staging/iio/addac/adt7316.c
+++ b/drivers/staging/iio/addac/adt7316.c
@@ -403,7 +403,7 @@ static ssize_t adt7316_show_ad_channel(struct device *dev,
                 return sprintf(buf, "5 - AIN4\n");
         default:
                 return sprintf(buf, "N/A\n");
-        };
+        }
 }
 
 static ssize_t adt7316_store_ad_channel(struct device *dev,
@@ -893,7 +893,7 @@ static ssize_t adt7316_show_DAC_update_mode(struct device *dev,
                         return sprintf(buf, "2 - auto at MSB DAC ABCD writing\n");
                 default: /* ADT7316_DA_EN_MODE_LDAC */
                         return sprintf(buf, "3 - manual\n");
-                };
+                }
         }
 }
 
@@ -1205,7 +1205,7 @@ static ssize_t adt7316_show_ad(struct adt7316_chip_info *chip,
                         return sprintf(buf, "%d\n", data);
                 else
                         break;
-        };
+        }
 
         if (data & ADT7316_T_VALUE_SIGN) {
                 /* convert supplement to positive value */
diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/lirc/lirc_serial.c
index 1c3099b388e..4a3cca03224 100644
--- a/drivers/staging/lirc/lirc_serial.c
+++ b/drivers/staging/lirc/lirc_serial.c
@@ -919,7 +919,7 @@ static int set_use_inc(void *data)
         default:
                 dprintk("Interrupt %d, port %04x obtained\n", irq, io);
                 break;
-        };
+        }
 
         spin_lock_irqsave(&hardware[type].lock, flags);
 
diff --git a/drivers/staging/vt6655/wpactl.c b/drivers/staging/vt6655/wpactl.c
index c328f95d6a3..a0f994ed58f 100644
--- a/drivers/staging/vt6655/wpactl.c
+++ b/drivers/staging/vt6655/wpactl.c
@@ -832,7 +832,7 @@ else
                 break;
         default:
                 pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;
-        };
+        }
 
 //DavidWang add for WPA_supplicant support open/share mode
 
diff --git a/drivers/staging/vt6656/wpactl.c b/drivers/staging/vt6656/wpactl.c
index d22e773333d..9216df01829 100644
--- a/drivers/staging/vt6656/wpactl.c
+++ b/drivers/staging/vt6656/wpactl.c
@@ -831,7 +831,7 @@ static int wpa_set_associate(PSDevice pDevice,
                 break;
         default:
                 pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;
-        };
+        }
 
            pMgmt->Roam_dbm = param->u.wpa_associate.roam_dbm;
          // if ((pMgmt->Roam_dbm > 40)&&(pMgmt->Roam_dbm<80))