staging: Remove unnecessary semicolons when switch (foo) {...};
authorJoe Perches <joe@perches.com>
Sun, 10 Apr 2011 21:31:35 +0000 (14:31 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 25 Apr 2011 23:58:35 +0000 (16:58 -0700)
Done via perl script:

$ cat remove_semi_switch.pl
my $match_balanced_parentheses = qr/(\((?:[^\(\)]++|(?-1))*\))/;
my $match_balanced_braces      = qr/(\{(?:[^\{\}]++|(?-1))*\})/;

foreach my $file (@ARGV) {
    my $f;
    my $text;
    my $oldtext;

    next if ((-d $file));

    open($f, '<', $file)
or die "$P: Can't open $file for read\n";
    $oldtext = do { local($/) ; <$f> };
    close($f);

    next if ($oldtext eq "");

    $text = $oldtext;

    my $count = 0;
    do {
$count = 0;
$count += $text =~ s@\b(switch\s*${match_balanced_parentheses}\s*)${match_balanced_braces}\s*;@"$1$3"@egx;
    } while ($count > 0);

    if ($text ne $oldtext) {
my $newfile = $file;

open($f, '>', $newfile)
    or die "$P: Can't open $newfile for write\n";
print $f $text;
close($f);
    }
}

$

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
16 files changed:
drivers/staging/ath6kl/os/linux/ar6000_drv.c
drivers/staging/comedi/drivers/adl_pci9118.c
drivers/staging/comedi/drivers/cb_pcidda.c
drivers/staging/comedi/drivers/cb_pcimdas.c
drivers/staging/comedi/drivers/ni_660x.c
drivers/staging/comedi/drivers/ni_mio_common.c
drivers/staging/comedi/drivers/ni_tio.c
drivers/staging/comedi/drivers/pcl818.c
drivers/staging/crystalhd/crystalhd_misc.c
drivers/staging/cx25821/cx25821-video.c
drivers/staging/hv/hv_util.c
drivers/staging/iio/accel/lis3l02dq_core.c
drivers/staging/iio/addac/adt7316.c
drivers/staging/lirc/lirc_serial.c
drivers/staging/vt6655/wpactl.c
drivers/staging/vt6656/wpactl.c

index 36722ed6b53330efdb6dbfc37a78d477da30f8f5..1c7c159fdc377716857ba4abf2b973af273d2a66 100644 (file)
@@ -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 */,
index 632d5d0721cd495a458c3a80f611af427491799b..08b71d9974b686dbc102bd05f111cda9a8e54cb0 100644 (file)
@@ -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);
index 6383fc93b83dc45f46c54f41784e518ec1ef770e..49102b3a6c4adfd8ff384532f3c992a557da8186 100644 (file)
@@ -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;
index 3d53df000cf11ee4f77601b8b0695dc28dd4afcf..b1b832b65bc101f7b7c0f45a9590faf44978160d 100644 (file)
@@ -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");
index ca2aeaa9449cfaac27348a9442a02031b2bb2242..35f3a47498256d85a407c0a4b01534365c66aa93 100644 (file)
@@ -1418,7 +1418,7 @@ static int ni_660x_dio_insn_config(struct comedi_device *dev,
        default:
                return -EINVAL;
                break;
-       };
+       }
        return 0;
 }
 
index 986ef671298965fecf04f42303002524cddb1a83..fd232bc5f87349f2f0238f31c4f3fe982a563ba7 100644 (file)
@@ -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;
index a9bb6b13dfc46d9deebe35298a7e5dc0a627d873..98f87897e2a823b31085b92cf03adf865015f449 100644 (file)
@@ -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);
index e3eea09ae1fb5cb865523a2a2c2058a73d093589..8933e5089bd337e6bd44ecf3bb2e14fba35649b8 100644 (file)
@@ -1662,7 +1662,7 @@ static void rtc_dropped_irq(unsigned long data)
                tmp = (CMOS_READ(RTC_INTR_FLAGS) & 0xF0);       /* restart */
                restore_flags(flags);
                break;
-       };
+       }
 }
 
 /*
index 2c5138e4e1b59ab42950c70df925b30a193fbd4f..5fa0c6e10ce265c0356023ea5bd22da2eefe6ac1 100644 (file)
@@ -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;
index 04b18f4d98f8a5f05969345e39fb1d46c9c7106c..7a0304a857358557a869b23e279ee7d48c06220c 100644 (file)
@@ -1574,7 +1574,7 @@ int cx25821_set_control(struct cx25821_dev *dev,
                break;
        default:
                /* nothing */ ;
-       };
+       }
 
        switch (ctl->id) {
        case V4L2_CID_BRIGHTNESS:
index 8038589e2c057e5defd54222f7a24f490770d127..ea76ddaa5fcd054b2818e152003cdde0e9013d09 100644 (file)
@@ -88,7 +88,7 @@ static void shutdown_onchannelcallback(void *context)
                                pr_info("Shutdown request received -"
                                            " Invalid request\n");
                                break;
-                       };
+                       }
                }
 
                icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION
index 3067f9662d20e98908a31424697a108afaea98eb..34f16a7cc3aeee37bbe628671db5ea81ca375bd2 100644 (file)
@@ -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,
index d1b5b13629d926533d59f5af3abdec98cd0093c3..9b25f1205449fd10ea35e0bb88a50d5c318f66d2 100644 (file)
@@ -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 */
index 1c3099b388e0acefd601621dbe05a9c6b78451b7..4a3cca03224a8a114176a9ea4f09600d3f245600 100644 (file)
@@ -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);
 
index c328f95d6a3617efea0e416b1943a379a3a8cc02..a0f994ed58feaa8dd29817bab181b8370375bf2f 100644 (file)
@@ -832,7 +832,7 @@ else
                break;
        default:
                pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;
-       };
+       }
 
 //DavidWang add for WPA_supplicant support open/share mode
 
index d22e773333dda9abe6e23c9b49a09d600ca98d42..9216df01829e90e53ee8edd18b779800b6e0dbd5 100644 (file)
@@ -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))