treewide: Remove unnecessary semicolons
Subsystems (104)
cover treewide: Remove unnecessary semicolons
Joe Perches (4):
treewide: Remove unnecessary semicolons when if (foo) {...};
treewide: Remove unnecessary semicolons when while (foo) {...};
treewide: Remove unnecessary semicolons when for (foo) {...};
treewide: Remove unnecessary semicolons when switch (foo) {...};
arch/alpha/kernel/osf_sys.c | 2 +- arch/alpha/kernel/sys_eiger.c | 2 +- arch/arm/mach-at91/gpio.c | 2 +- arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- arch/arm/mach-omap1/devices.c | 2 +- arch/arm/mach-omap2/board-flash.c | 2 +- arch/arm/mach-omap2/clkt_clksel.c | 2 +- arch/arm/mach-omap2/mux.c | 2 +- arch/arm/mach-omap2/pm-debug.c | 2 +- arch/arm/mach-s3c2410/mach-h1940.c | 2 +- arch/arm/plat-mxc/ulpi.c | 2 +- arch/arm/plat-omap/omap-pm-noop.c | 8 ++-- arch/arm/plat-stmp3xxx/clock.c | 2 +- arch/cris/arch-v32/drivers/cryptocop.c | 4 +- arch/ia64/kvm/vcpu.c | 2 +- arch/ia64/kvm/vtlb.c | 4 +- arch/m68k/include/asm/sun3xflop.h | 4 +- arch/m68k/sun3/prom/console.c | 10 ++-- arch/m68k/sun3/prom/init.c | 2 +- arch/mips/oprofile/common.c | 2 +- arch/powerpc/boot/cuboot-c2k.c | 2 +- arch/powerpc/include/asm/ps3.h | 2 +- arch/powerpc/kernel/prom_init.c | 2 +- arch/powerpc/kvm/booke.h | 2 +- arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 +- arch/powerpc/platforms/ps3/system-bus.c | 4 +- arch/powerpc/platforms/pseries/eeh.c | 2 +- arch/powerpc/sysdev/tsi108_dev.c | 2 +- arch/s390/mm/extmem.c | 2 +- arch/sparc/include/asm/floppy_32.h | 8 ++-- arch/sparc/include/asm/floppy_64.h | 4 +- arch/sparc/include/asm/system_32.h | 2 +- arch/sparc/include/asm/system_64.h | 2 +- arch/sparc/kernel/apc.c | 2 +- arch/sparc/kernel/auxio_32.c | 2 +- arch/sparc/kernel/chmc.c | 2 +- arch/sparc/kernel/module.c | 2 +- arch/sparc/kernel/pci_common.c | 4 +- arch/sparc/kernel/pci_schizo.c | 6 +- arch/sparc/kernel/pci_sun4v.c | 2 +- arch/sparc/kernel/prom_irqtrans.c | 2 +- arch/sparc/kernel/psycho_common.c | 2 +- arch/sparc/kernel/sbus.c | 4 +- arch/sparc/kernel/setup_32.c | 2 +- arch/sparc/kernel/setup_64.c | 2 +- arch/sparc/kernel/smp_32.c | 6 +- arch/sparc/kernel/sys_sparc32.c | 2 +- arch/sparc/kernel/sys_sparc_64.c | 6 +- arch/sparc/kernel/time_64.c | 2 +- arch/sparc/kernel/traps_64.c | 2 +- arch/sparc/kernel/unaligned_64.c | 6 +- arch/sparc/kernel/us2e_cpufreq.c | 6 +- arch/sparc/kernel/us3_cpufreq.c | 4 +- arch/sparc/kernel/viohs.c | 2 +- arch/sparc/kernel/visemul.c | 14 +++--- arch/sparc/mm/fault_32.c | 2 +- arch/sparc/mm/init_32.c | 2 +- arch/sparc/mm/init_64.c | 6 +- arch/sparc/mm/srmmu.c | 4 +- arch/sparc/mm/sun4c.c | 8 ++-- arch/sparc/mm/tsb.c | 6 +- arch/sparc/prom/console_32.c | 2 +- arch/sparc/prom/init_32.c | 2 +- arch/sparc/prom/mp.c | 2 +- arch/x86/kernel/alternative.c | 4 +- arch/x86/kernel/cpu/cpufreq/longhaul.c | 2 +- arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 2 +- arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 2 +- arch/x86/kvm/vmx.c | 2 +- arch/x86/pci/mmconfig-shared.c | 2 +- block/blk-core.c | 2 +- crypto/af_alg.c | 2 +- drivers/acpi/acpica/nsalloc.c | 2 +- drivers/acpi/apei/erst.c | 2 +- drivers/ata/pata_bf54x.c | 2 +- drivers/atm/firestream.c | 2 +- drivers/atm/horizon.c | 4 +- drivers/block/drbd/drbd_receiver.c | 2 +- drivers/block/drbd/drbd_req.c | 2 +- drivers/block/sunvdc.c | 2 +- drivers/bluetooth/bfusb.c | 2 +- drivers/bluetooth/bluecard_cs.c | 2 +- drivers/bluetooth/bt3c_cs.c | 2 +- drivers/bluetooth/btuart_cs.c | 2 +- drivers/bluetooth/dtl1_cs.c | 2 +- drivers/bluetooth/hci_ldisc.c | 2 +- drivers/bluetooth/hci_ll.c | 2 +- drivers/bluetooth/hci_vhci.c | 2 +- drivers/char/nwbutton.c | 4 +- drivers/char/rtc.c | 2 +- drivers/gpu/drm/i915/dvo_ch7xxx.c | 2 +- drivers/gpu/drm/i915/dvo_ivch.c | 2 +- drivers/gpu/drm/i915/dvo_sil164.c | 2 +- drivers/gpu/drm/i915/dvo_tfp410.c | 2 +- drivers/hwmon/adm1026.c | 6 +- drivers/hwmon/asc7621.c | 12 ++-- drivers/ide/ide-taskfile.c | 2 +- drivers/infiniband/hw/amso1100/c2_ae.c | 2 +- drivers/infiniband/hw/mthca/mthca_eq.c | 2 +- drivers/input/serio/serio_raw.c | 2 +- drivers/isdn/hisax/netjet.c | 2 +- drivers/isdn/hisax/q931.c | 2 +- drivers/isdn/hisax/st5481.h | 2 +- drivers/isdn/i4l/isdn_net.c | 2 +- drivers/isdn/pcbit/drv.c | 4 +- drivers/isdn/pcbit/layer2.h | 4 +- drivers/media/common/tuners/tda18271-common.c | 10 ++-- drivers/media/common/tuners/tuner-xc2028.c | 2 +- drivers/media/dvb/b2c2/flexcop-sram.c | 6 +- drivers/media/dvb/bt8xx/dst_ca.c | 2 +- drivers/media/dvb/dvb-core/dvb_demux.c | 10 ++-- drivers/media/dvb/dvb-core/dvb_frontend.c | 2 +- drivers/media/dvb/dvb-usb/af9015.c | 4 +- drivers/media/dvb/frontends/af9013.c | 6 +- drivers/media/dvb/frontends/bcm3510.c | 2 +- drivers/media/dvb/frontends/cx24110.c | 4 +- drivers/media/dvb/frontends/cx24123.c | 2 +- drivers/media/dvb/frontends/drxd_hard.c | 2 +- drivers/media/dvb/frontends/isl6405.c | 2 +- drivers/media/dvb/frontends/isl6421.c | 2 +- drivers/media/dvb/frontends/lnbp21.c | 4 +- drivers/media/dvb/frontends/si21xx.c | 4 +- drivers/media/dvb/frontends/sp8870.c | 6 +- drivers/media/dvb/frontends/sp887x.c | 6 +- drivers/media/dvb/frontends/stv0299.c | 6 +- drivers/media/dvb/frontends/stv0900_core.c | 2 +- drivers/media/dvb/frontends/tda8083.c | 8 ++-- drivers/media/radio/si470x/radio-si470x-common.c | 10 ++-- drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +- drivers/media/radio/si470x/radio-si470x-usb.c | 2 +- drivers/media/radio/si4713-i2c.c | 12 ++-- drivers/media/video/cx23885/altera-ci.c | 4 +- drivers/media/video/cx23885/cimax2.c | 2 +- drivers/media/video/cx25840/cx25840-core.c | 2 +- drivers/media/video/cx88/cx88-dvb.c | 2 +- drivers/media/video/cx88/cx88-mpeg.c | 2 +- drivers/media/video/cx88/cx88-tvaudio.c | 4 +- drivers/media/video/cx88/cx88-video.c | 2 +- drivers/media/video/gspca/stv06xx/stv06xx_st6422.c | 2 +- drivers/media/video/omap3isp/ispccdc.c | 4 +- drivers/media/video/ov9640.c | 2 +- drivers/media/video/saa7134/saa7134-video.c | 2 +- drivers/media/video/tea6415c.c | 4 +- drivers/memstick/core/mspro_block.c | 2 +- drivers/memstick/host/jmb38x_ms.c | 2 +- drivers/memstick/host/tifm_ms.c | 2 +- drivers/message/i2o/iop.c | 2 +- drivers/mfd/tps65010.c | 2 +- drivers/misc/ti-st/st_core.c | 2 +- drivers/mmc/host/davinci_mmc.c | 2 +- drivers/mmc/host/wbsd.c | 2 +- drivers/mtd/maps/bcm963xx-flash.c | 10 ++-- drivers/mtd/nand/mpc5121_nfc.c | 2 +- drivers/mtd/ubi/cdev.c | 2 +- drivers/net/amd8111e.c | 2 +- drivers/net/cxgb4/cxgb4_main.c | 2 +- drivers/net/enic/enic_main.c | 2 +- drivers/net/irda/via-ircc.h | 2 +- drivers/net/iseries_veth.c | 4 +- drivers/net/ixgbe/ixgbe_82599.c | 4 +- drivers/net/ixgbe/ixgbe_common.c | 4 +- drivers/net/myri10ge/myri10ge.c | 2 +- drivers/net/netxen/netxen_nic_init.c | 2 +- drivers/net/ps3_gelic_net.c | 2 +- drivers/net/slhc.c | 2 +- drivers/net/sungem.c | 2 +- drivers/net/tokenring/3c359.c | 4 +- drivers/net/tokenring/ibmtr.c | 2 +- drivers/net/tun.c | 2 +- drivers/net/via-velocity.c | 2 +- drivers/net/wireless/b43/main.c | 2 +- drivers/net/wireless/b43legacy/main.c | 2 +- drivers/net/wireless/iwmc3200wifi/fw.c | 2 +- drivers/net/wireless/orinoco/main.c | 2 +- drivers/net/wireless/rt2x00/rt2800lib.c | 2 +- drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- drivers/net/znet.c | 2 +- drivers/nfc/pn544.c | 4 +- drivers/pci/proc.c | 2 +- drivers/pci/syscall.c | 2 +- drivers/pcmcia/db1xxx_ss.c | 2 +- drivers/pcmcia/m8xx_pcmcia.c | 2 +- drivers/rtc/rtc-isl12022.c | 2 +- drivers/rtc/rtc-pcf8563.c | 2 +- drivers/rtc/rtc-rs5c372.c | 2 +- drivers/s390/char/monreader.c | 2 +- drivers/s390/net/ctcm_fsms.c | 2 +- drivers/s390/net/qeth_core_main.c | 4 +- drivers/s390/scsi/zfcp_fc.h | 2 +- drivers/s390/scsi/zfcp_fsf.c | 2 +- drivers/sbus/char/display7seg.c | 2 +- drivers/sbus/char/envctrl.c | 8 ++-- drivers/sbus/char/openprom.c | 6 +- drivers/scsi/aha1542.c | 24 ++++---- drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- drivers/scsi/bfa/bfa_fcs_rport.c | 2 +- drivers/scsi/fnic/fnic_main.c | 2 +- drivers/scsi/ibmvscsi/ibmvfc.c | 36 ++++++------ drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- drivers/scsi/ipr.c | 4 +- drivers/scsi/ipr.h | 2 +- drivers/scsi/nsp32.c | 4 +- drivers/scsi/pmcraid.c | 2 +- drivers/scsi/qlogicpti.c | 2 +- drivers/scsi/scsi_tgt_if.c | 2 +- drivers/scsi/sgiwd93.c | 2 +- drivers/scsi/sym53c8xx_2/sym_fw.c | 6 +- drivers/scsi/ultrastor.c | 2 +- drivers/tty/nozomi.c | 6 +- drivers/tty/serial/bfin_5xx.c | 4 +- drivers/tty/serial/ip22zilog.c | 2 +- drivers/tty/serial/pmac_zilog.c | 2 +- drivers/tty/serial/sunsab.c | 2 +- drivers/tty/serial/sunsu.c | 2 +- drivers/tty/serial/sunzilog.c | 6 +- drivers/tty/serial/ucc_uart.c | 2 +- drivers/usb/core/hcd.c | 2 +- drivers/usb/core/hub.c | 2 +- drivers/usb/gadget/composite.c | 2 +- drivers/usb/gadget/dummy_hcd.c | 6 +- drivers/usb/gadget/goku_udc.c | 2 +- drivers/usb/gadget/langwell_udc.c | 2 +- drivers/usb/gadget/net2280.c | 4 +- drivers/usb/gadget/rndis.c | 2 +- drivers/usb/host/ehci-dbg.c | 2 +- drivers/usb/host/isp116x.h | 2 +- drivers/usb/host/isp1362-hcd.c | 2 +- drivers/usb/host/ohci-dbg.c | 2 +- drivers/usb/host/sl811-hcd.c | 4 +- drivers/usb/host/uhci-hcd.c | 2 +- drivers/usb/host/whci/hcd.c | 4 +- drivers/usb/misc/rio500.c | 2 +- drivers/usb/misc/usbtest.c | 2 +- drivers/usb/musb/musb_core.c | 4 +- drivers/usb/musb/musb_gadget.c | 2 +- drivers/usb/musb/musb_host.c | 4 +- drivers/usb/otg/twl4030-usb.c | 2 +- drivers/usb/otg/ulpi_viewport.c | 2 +- drivers/usb/wusbcore/cbaf.c | 4 +- drivers/usb/wusbcore/devconnect.c | 2 +- drivers/usb/wusbcore/wa-xfer.c | 4 +- drivers/uwb/i1480/dfu/mac.c | 2 +- drivers/uwb/ie.c | 2 +- drivers/vbus/pci-bridge.c | 2 +- drivers/video/cfbimgblt.c | 2 +- drivers/video/cg14.c | 4 +- drivers/video/cg6.c | 2 +- drivers/video/leo.c | 2 +- drivers/video/matrox/matroxfb_DAC1064.c | 4 +- drivers/video/matrox/matroxfb_Ti3026.c | 2 +- drivers/video/nvidia/nv_hw.c | 2 +- drivers/video/sbuslib.c | 2 +- drivers/video/sis/sis_accel.h | 14 +++--- drivers/video/sysimgblt.c | 2 +- drivers/video/tcx.c | 4 +- drivers/watchdog/riowd.c | 2 +- fs/9p/vfs_inode.c | 2 +- fs/befs/btree.c | 2 +- fs/btrfs/print-tree.c | 2 +- fs/ext4/super.c | 2 +- fs/gfs2/inode.c | 2 +- fs/gfs2/ops_inode.c | 2 +- fs/gfs2/recovery.c | 2 +- fs/jffs2/wbuf.c | 2 +- fs/lockd/clnt4xdr.c | 4 +- fs/lockd/clntxdr.c | 4 +- fs/nfs/nfs2xdr.c | 10 ++-- fs/nfs/nfs3xdr.c | 56 ++++++++++---------- fs/nfs/nfs4proc.c | 2 +- fs/nfs/nfs4state.c | 2 +- fs/nfs/super.c | 4 +- fs/nfsd/nfs4callback.c | 2 +- fs/nfsd/nfs4state.c | 2 +- fs/notify/fanotify/fanotify.c | 2 +- fs/notify/inotify/inotify_fsnotify.c | 2 +- fs/ntfs/lcnalloc.c | 2 +- fs/ntfs/super.c | 4 +- fs/ocfs2/cluster/quorum.c | 2 +- fs/ocfs2/dlmglue.c | 2 +- fs/partitions/msdos.c | 2 +- fs/reiserfs/bitmap.c | 2 +- fs/ubifs/sb.c | 2 +- include/linux/hp_sdc.h | 2 +- include/net/sctp/sctp.h | 4 +- kernel/audit_watch.c | 2 +- kernel/res_counter.c | 2 +- kernel/smp.c | 2 +- kernel/trace/ftrace.c | 2 +- lib/decompress_bunzip2.c | 2 +- net/batman-adv/hard-interface.c | 2 +- net/bluetooth/hci_core.c | 4 +- net/sunrpc/auth.c | 2 +- security/selinux/hooks.c | 2 +- sound/drivers/vx/vx_pcm.c | 2 +- sound/isa/wavefront/wavefront_synth.c | 2 +- sound/oss/sb_ess.c | 22 ++++---- sound/oss/sb_mixer.c | 4 +- sound/oss/uart6850.c | 2 +- sound/pci/asihpi/asihpi.c | 2 +- sound/pci/au88x0/au88x0_game.c | 2 +- sound/pci/emu10k1/emupcm.c | 2 +- sound/pci/intel8x0.c | 2 +- sound/pci/mixart/mixart_hwdep.c | 2 +- sound/sparc/amd7930.c | 4 +- sound/sparc/dbri.c | 2 +- tools/perf/builtin-lock.c | 2 +- tools/perf/util/trace-event-read.c | 2 +- 307 files changed, 518 insertions(+), 518 deletions(-)
Signature · 1 line
1.7.4.2.g597a6.dirty
PATCH 1/4 treewide: Remove unnecessary semicolons when if (foo) {...};
Done via perl script:
$ cat remove_semi_if.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(if\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);
}
}$
One false positive removed.
--- arch/arm/mach-omap2/clkt_clksel.c | 2 +- arch/arm/plat-omap/omap-pm-noop.c | 8 ++++---- arch/powerpc/kernel/prom_init.c | 2 +- arch/powerpc/kvm/booke.h | 2 +- arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 2 +- arch/powerpc/sysdev/tsi108_dev.c | 2 +- arch/sparc/kernel/pci_sun4v.c | 2 +- arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 2 +- drivers/char/nwbutton.c | 2 +- drivers/gpu/drm/i915/dvo_ch7xxx.c | 2 +- drivers/gpu/drm/i915/dvo_ivch.c | 2 +- drivers/gpu/drm/i915/dvo_sil164.c | 2 +- drivers/gpu/drm/i915/dvo_tfp410.c | 2 +- drivers/hwmon/adm1026.c | 6 +++--- drivers/hwmon/asc7621.c | 12 ++++++------ drivers/isdn/hisax/q931.c | 2 +- drivers/isdn/i4l/isdn_net.c | 2 +- drivers/media/dvb/dvb-core/dvb_demux.c | 10 +++++----- drivers/media/dvb/frontends/drxd_hard.c | 2 +- drivers/media/dvb/frontends/stv0900_core.c | 2 +- drivers/media/video/cx23885/altera-ci.c | 4 ++-- drivers/media/video/cx23885/cimax2.c | 2 +- drivers/media/video/gspca/stv06xx/stv06xx_st6422.c | 2 +- drivers/message/i2o/iop.c | 2 +- drivers/mtd/maps/bcm963xx-flash.c | 10 +++++----- drivers/mtd/ubi/cdev.c | 2 +- drivers/net/amd8111e.c | 2 +- drivers/net/cxgb4/cxgb4_main.c | 2 +- drivers/net/tokenring/3c359.c | 2 +- drivers/net/via-velocity.c | 2 +- drivers/s390/net/qeth_core_main.c | 2 +- drivers/scsi/aha1542.c | 14 +++++++------- drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- drivers/scsi/bfa/bfa_fcs_rport.c | 2 +- drivers/scsi/nsp32.c | 2 +- drivers/scsi/sym53c8xx_2/sym_fw.c | 2 +- drivers/scsi/ultrastor.c | 2 +- drivers/usb/host/uhci-hcd.c | 2 +- drivers/video/cfbimgblt.c | 2 +- drivers/video/sysimgblt.c | 2 +- fs/befs/btree.c | 2 +- fs/ext4/super.c | 2 +- fs/jffs2/wbuf.c | 2 +- fs/ntfs/lcnalloc.c | 2 +- fs/partitions/msdos.c | 2 +- fs/reiserfs/bitmap.c | 2 +- net/sunrpc/auth.c | 2 +- sound/oss/sb_ess.c | 12 ++++++------ sound/oss/sb_mixer.c | 4 ++-- sound/oss/uart6850.c | 2 +- sound/pci/au88x0/au88x0_game.c | 2 +- 51 files changed, 82 insertions(+), 82 deletions(-)
arch/arm/mach-omap2/clkt_clksel.c +1 -1
@@ -364,7 +364,7 @@ void omap2_init_clksel_parent(struct clk *clk) ((clk->parent) ? clk->parent->name : "NULL"));clk_reparent (clk, clks->parent); - }; + } found =1 ; } }
arch/arm/plat-omap/omap-pm-noop.c +4 -4
@@ -38,7 +38,7 @@ int omap_pm_set_max_mpu_wakeup_lat(struct device *dev, long t)if (!dev || t <-1 ) {WARN (1 ,"OMAP PM: %s: invalid parameter(s)" , __func__);return -EINVAL ; - }; + }if (t ==-1 ) pr_debug("OMAP PM: remove max MPU wakeup latency constraint: "
@@ -67,7 +67,7 @@ int omap_pm_set_min_bus_tput(struct device *dev, u8 agent_id, unsigned long r) agent_id != OCP_TARGET_AGENT)) {WARN (1 ,"OMAP PM: %s: invalid parameter(s)" , __func__);return -EINVAL ; - }; + }if (r ==0 ) pr_debug("OMAP PM: remove min bus tput constraint: "
@@ -94,7 +94,7 @@ int omap_pm_set_max_dev_wakeup_lat(struct device *req_dev, struct device *dev,if (!req_dev || !dev || t <-1 ) {WARN (1 ,"OMAP PM: %s: invalid parameter(s)" , __func__);return -EINVAL ; - }; + }if (t ==-1 ) pr_debug("OMAP PM: remove max device latency constraint: "
@@ -124,7 +124,7 @@ int omap_pm_set_max_sdma_lat(struct device *dev, long t)if (!dev || t <-1 ) {WARN (1 ,"OMAP PM: %s: invalid parameter(s)" , __func__);return -EINVAL ; - }; + }if (t ==-1 ) pr_debug("OMAP PM: remove max DMA latency constraint: "
arch/powerpc/kernel/prom_init.c +1 -1
@@ -2331,7 +2331,7 @@ static void __init fixup_device_tree_efika_add_phy(void)" 0x3 encode-int encode+" " s\" interrupts\" property" " finish-device"); - }; + }/* Check for a PHY device node - if missing then create one and * give it's phandle to the ethernet node */
arch/powerpc/kvm/booke.h +1 -1
@@ -64,7 +64,7 @@ static inline void kvmppc_set_msr(struct kvm_vcpu *vcpu, u32 new_msr)if (vcpu->arch.shared->msr &MSR_WE ) {kvm_vcpu_block (vcpu);kvmppc_set_exit_type (vcpu,EMULATED_MTMSRWE_EXITS ); - }; + } } int kvmppc_booke_emulate_op(struct kvm_run *run, struct kvm_vcpu *vcpu,
arch/powerpc/platforms/86xx/mpc8610_hpcd.c +1 -1
@@ -118,7 +118,7 @@ static u32 get_busfreq(void)if (prop) fs_busfreq = *prop;of_node_put (node); - }; + }return fs_busfreq; }
arch/powerpc/sysdev/tsi108_dev.c +1 -1
@@ -52,7 +52,7 @@ phys_addr_t get_csrbase(void)const void *prop =of_get_property (tsi,"reg" , &size); tsi108_csr_base =of_translate_address (tsi, prop);of_node_put (tsi); - }; + }return tsi108_csr_base; }
arch/sparc/kernel/pci_sun4v.c +1 -1
@@ -592,7 +592,7 @@ static int __devinit pci_sun4v_iommu_init(struct pci_pbm_info *pbm) printk(KERN_ERR PFX "Strange virtual-dma[%08x:%08x].\n", vdma[0], vdma[1]);return -EINVAL ; - }; + } dma_mask = (roundup_pow_of_two (vdma[1 ]) -1UL ); num_tsb_entries = vdma[1 ] /IO_PAGE_SIZE ;
arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c +1 -1
@@ -272,7 +272,7 @@ static int pcc_get_offset(int cpu)if (!pccp || pccp->type !=ACPI_TYPE_PACKAGE ) { ret = -ENODEV ; goto out_free; - }; + } offset = &(pccp->package.elements[0 ]);if (!offset || offset->type !=ACPI_TYPE_INTEGER ) {
drivers/char/nwbutton.c +1 -1
@@ -93,7 +93,7 @@ int button_del_callback (void (*callback) (void)) button_callback_list [lp].count =0 ; callback_count--;return 0 ; - }; + } lp--; };return -EINVAL ;
drivers/gpu/drm/i915/dvo_ch7xxx.c +1 -1
@@ -137,7 +137,7 @@ static bool ch7xxx_readb(struct intel_dvo_device *dvo, int addr, uint8_t *ch)if (i2c_transfer (adapter, msgs,2 ) ==2 ) { *ch = in_buf[0 ];return true; - }; + }if (!ch7xxx->quiet) { DRM_DEBUG_KMS("Unable to read register 0x%02x from %s:%02x.\n",
drivers/gpu/drm/i915/dvo_ivch.c +1 -1
@@ -195,7 +195,7 @@ static bool ivch_read(struct intel_dvo_device *dvo, int addr, uint16_t *data)if (i2c_transfer (adapter, msgs,3 ) ==3 ) { *data = (in_buf[1 ] <<8 ) | in_buf[0 ];return true; - }; + }if (!priv->quiet) { DRM_DEBUG_KMS("Unable to read register 0x%02x from "
drivers/gpu/drm/i915/dvo_sil164.c +1 -1
@@ -93,7 +93,7 @@ static bool sil164_readb(struct intel_dvo_device *dvo, int addr, uint8_t *ch)if (i2c_transfer (adapter, msgs,2 ) ==2 ) { *ch = in_buf[0 ];return true; - }; + }if (!sil->quiet) { DRM_DEBUG_KMS("Unable to read register 0x%02x from %s:%02x.\n",
drivers/gpu/drm/i915/dvo_tfp410.c +1 -1
@@ -118,7 +118,7 @@ static bool tfp410_readb(struct intel_dvo_device *dvo, int addr, uint8_t *ch)if (i2c_transfer (adapter, msgs,2 ) ==2 ) { *ch = in_buf[0 ];return true; - }; + }if (!tfp->quiet) { DRM_DEBUG_KMS("Unable to read register 0x%02x from %s:%02x.\n",
drivers/hwmon/adm1026.c +3 -3
@@ -608,7 +608,7 @@ static struct adm1026_data *adm1026_update_device(struct device *dev) data->gpio = gpio; data->last_reading = jiffies; - };/* last_reading */ + }/* last_reading */ if (!data->valid ||time_after (jiffies, data->last_config +ADM1026_CONFIG_INTERVAL )) {
@@ -691,7 +691,7 @@ static struct adm1026_data *adm1026_update_device(struct device *dev) } data->last_config = jiffies; - };/* last_config */ + }/* last_config */ data->valid =1 ;mutex_unlock (&data->update_lock);
@@ -1657,7 +1657,7 @@ static int adm1026_detect(struct i2c_client *client,if (!i2c_check_functionality (adapter,I2C_FUNC_SMBUS_BYTE_DATA )) {/* We need to be able to do byte I/O */ return -ENODEV ; - }; + }/* Now, we do the remaining detection. */
drivers/hwmon/asc7621.c +6 -6
@@ -138,7 +138,7 @@ static inline u8 read_byte(struct i2c_client *client, u8 reg)dev_err (&client->dev,"Unable to read from register 0x%02x.\n" , reg);return 0 ; - }; + }return res &0xff ; }
@@ -149,7 +149,7 @@ static inline int write_byte(struct i2c_client *client, u8 reg, u8 data)dev_err (&client->dev,"Unable to write value 0x%02x to register 0x%02x.\n" , data, reg); - }; + }return res; }
@@ -1028,7 +1028,7 @@ static struct asc7621_data *asc7621_update_device(struct device *dev) } } data->last_high_reading = jiffies; - };/* last_reading */ + }/* last_reading */ /* Read all the low priority registers. */
@@ -1042,7 +1042,7 @@ static struct asc7621_data *asc7621_update_device(struct device *dev) } } data->last_low_reading = jiffies; - };/* last_reading */ + }/* last_reading */ data->valid =1 ;
@@ -1082,11 +1082,11 @@ static void asc7621_init_client(struct i2c_client *client)dev_err (&client->dev,"Client (%d,0x%02x) config is locked.\n" ,i2c_adapter_id (client->adapter), client->addr); - }; + }if (!(value &0x04 )) {dev_err (&client->dev,"Client (%d,0x%02x) is not ready.\n" ,i2c_adapter_id (client->adapter), client->addr); - }; + }/* * Start monitoring
drivers/isdn/hisax/q931.c +1 -1
@@ -598,7 +598,7 @@ prcalling(char *dest, u_char * p) dp +=prbits (dp, *++p,8 ,8 ); *dp++ ='\n' ; l--; - }; + } p++; dp +=sprintf (dp," number digits " );
drivers/isdn/i4l/isdn_net.c +1 -1
@@ -1859,7 +1859,7 @@ isdn_net_receive(struct net_device *ndev, struct sk_buff *skb)if ( cprot -> pops -> data_ind){ cprot -> pops ->data_ind (cprot,skb);return ; - }; + }#endif /* CONFIG_ISDN_X25 */ printk (KERN_WARNING "%s: unknown encapsulation, dropping\n" , lp->netdev->dev->name);
drivers/media/dvb/dvb-core/dvb_demux.c +5 -5
@@ -419,12 +419,12 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf)printk (KERN_INFO "TS speed %llu Kbits/sec \n" ,div64_u64 (speed_bytes, speed_timedelta)); - }; + } demux->speed_last_time = cur_time; demux->speed_pkts_cnt =0 ; - }; - }; + } + }if (demux->cnt_storage && dvb_demux_tscheck) {/* check pkt counter */
@@ -442,9 +442,9 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf) buf[3] & 0xf); demux->cnt_storage[pid] = ((buf[3 ] &0xf ) +1 )&0xf ; - }; + }/* end check */ - }; + }list_for_each_entry (feed, &demux->feed_list, list_head) {if ((feed->pid != pid) && (feed->pid !=0x2000 ))
drivers/media/dvb/frontends/drxd_hard.c +1 -1
@@ -985,7 +985,7 @@ static int HI_Command(struct drxd_state *state, u16 cmd, u16 * pResult)if (nrRetries >DRXD_MAX_RETRIES ) { status =-1 ;break ; - }; + } status =Read16 (state,HI_RA_RAM_SRV_CMD__A , &waitCmd,0 ); }while (waitCmd !=0 );
drivers/media/dvb/frontends/stv0900_core.c +1 -1
@@ -1569,7 +1569,7 @@ static int stv0900_status(struct stv0900_internal *intp, * (tsbitrate1_val <<8 | tsbitrate0_val); bitrate /=16384 ;dprintk ("TS bitrate = %d Mbit/sec \n" , bitrate); - }; + }return locked; }
drivers/media/video/cx23885/altera-ci.c +2 -2
@@ -417,7 +417,7 @@ static void netup_read_ci_status(struct work_struct *work) DVB_CA_EN50221_POLL_CAM_READY : 0);ci_dbg_print ("%s: setting CI[1] status = 0x%x\n" , __func__, inter->state[1 ]->status); - }; + }if (inter->state[0 ] !=NULL ) { inter->state[0]->status =
@@ -426,7 +426,7 @@ static void netup_read_ci_status(struct work_struct *work) DVB_CA_EN50221_POLL_CAM_READY : 0);ci_dbg_print ("%s: setting CI[0] status = 0x%x\n" , __func__, inter->state[0 ]->status); - }; + } }/* CI irq handler */
drivers/media/video/cx23885/cimax2.c +1 -1
@@ -193,7 +193,7 @@ int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot, 0, &store, 1);if (ret !=0 )return ret; - }; + } state->current_ci_flag = flag;mutex_lock (&dev->gpio_lock);
drivers/media/video/gspca/stv06xx/stv06xx_st6422.c +1 -1
@@ -227,7 +227,7 @@ static int st6422_init(struct sd *sd) { 0x143f, 0x01 }, /* commit settings */ - }; + }for (i =0 ; i <ARRAY_SIZE (st6422_bridge_init) && !err; i++) { err = stv06xx_write_bridge(sd, st6422_bridge_init[i][0],
drivers/message/i2o/iop.c +1 -1
@@ -1063,7 +1063,7 @@ struct i2o_controller *i2o_iop_alloc(void) I2O_MSG_INPOOL_MIN)) {kfree (c);return ERR_PTR (-ENOMEM ); - }; + }INIT_LIST_HEAD (&c->devices);spin_lock_init (&c->lock);
drivers/mtd/maps/bcm963xx-flash.c +5 -5
@@ -93,18 +93,18 @@ static int parse_cfe_partitions(struct mtd_info *master,if (rootfslen >0 ) { nrparts++; namelen +=6 ; - }; + }if (kernellen >0 ) { nrparts++; namelen +=6 ; - }; + }/* Ask kernel for more memory */ parts =kzalloc (sizeof (*parts) * nrparts +10 * nrparts,GFP_KERNEL );if (!parts) {vfree (buf);return -ENOMEM ; - }; + }/* Start building partition list */ parts[curpart].name ="CFE" ;
@@ -117,7 +117,7 @@ static int parse_cfe_partitions(struct mtd_info *master, parts[curpart].offset = kerneladdr; parts[curpart].size = kernellen; curpart++; - }; + }if (rootfslen >0 ) { parts[curpart].name ="rootfs" ;
@@ -126,7 +126,7 @@ static int parse_cfe_partitions(struct mtd_info *master,if (sparelen >0 ) parts[curpart].size += sparelen; curpart++; - }; + } parts[curpart].name ="nvram" ; parts[curpart].offset = master->size - master->erasesize;
drivers/mtd/ubi/cdev.c +1 -1
@@ -944,7 +944,7 @@ static long ubi_cdev_ioctl(struct file *file, unsigned int cmd,if (!req) { err = -ENOMEM ;break ; - }; + } err =copy_from_user (req, argp,sizeof (struct ubi_rnvol_req ));if (err) {
drivers/net/amd8111e.c +1 -1
@@ -1958,7 +1958,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,IPG_CONVERGE_JIFFIES ; lp->ipg_data.ipg =DEFAULT_IPG ; lp->ipg_data.ipg_state =CSTATE ; - }; + }/* display driver and device information */
drivers/net/cxgb4/cxgb4_main.c +1 -1
@@ -3735,7 +3735,7 @@ static int __devinit init_one(struct pci_dev *pdev,if (err) {dev_warn (&pdev->dev,"only %d net devices registered\n" , i); err =0 ; - }; + }if (cxgb4_debugfs_root) { adapter->debugfs_root = debugfs_create_dir(pci_name(pdev),
drivers/net/tokenring/3c359.c +1 -1
@@ -304,7 +304,7 @@ static int __devinit xl_probe(struct pci_dev *pdev,if ((i =pci_request_regions (pdev,"3c359" ))) {return i ; - } ; + }/* * Allowing init_trdev to allocate the private data will align
drivers/net/via-velocity.c +1 -1
@@ -1887,7 +1887,7 @@ static void velocity_error(struct velocity_info *vptr, int status)else netif_wake_queue (vptr->dev); - }; + }if (status &ISR_MIBFI )velocity_update_hw_mibs (vptr);if (status &ISR_LSTEI )
drivers/s390/net/qeth_core_main.c +1 -1
@@ -278,7 +278,7 @@ static struct qeth_reply *qeth_alloc_reply(struct qeth_card *card)atomic_set (&reply->refcnt,1 );atomic_set (&reply->received,0 ); reply->card = card; - }; + }return reply; }
drivers/scsi/aha1542.c +7 -7
@@ -475,7 +475,7 @@ static void aha1542_intr_handle(struct Scsi_Host *shost)if (needs_restart)aha1542_restart (shost);return ; - }; + } mbo = (scsi2int (mb[mbi].ccbptr) - (SCSI_BUF_PA (&ccb[0 ]))) /sizeof (struct ccb ); mbistatus = mb[mbi].status;
@@ -755,7 +755,7 @@ static int __init aha1542_getconfig(int base_io, unsigned char *irq_level, unsig i =inb (STATUS (base_io));if (i &DF ) { i =inb (DATA (base_io)); - }; + }aha1542_out (base_io, inquiry_cmd,1 );aha1542_in (base_io, inquiry_result,3 );WAIT (INTRFLAGS (base_io),INTRMASK ,HACC ,0 );
@@ -841,7 +841,7 @@ static int __init aha1542_mbenable(int base)aha1542_out (base, mbenable_cmd,3 );WAIT (INTRFLAGS (base),INTRMASK ,HACC ,0 ); - }; + }while (0 ) { fail:printk (KERN_ERR "aha1542_mbenable: Mailbox init failed\n" );
@@ -859,7 +859,7 @@ static int __init aha1542_query(int base_io, int *transl) i =inb (STATUS (base_io));if (i &DF ) { i =inb (DATA (base_io)); - }; + }aha1542_out (base_io, inquiry_cmd,1 );aha1542_in (base_io, inquiry_result,4 );WAIT (INTRFLAGS (base_io),INTRMASK ,HACC ,0 );
@@ -880,7 +880,7 @@ fail:if (inquiry_result[0 ] ==0x43 ) {printk (KERN_INFO "aha1542.c: Emulation mode not supported for AHA 174N hardware.\n" );return 1 ; - }; + }/* Always call this - boards that do not support extended bios translation will ignore the command, and we will set the proper default */
@@ -1240,7 +1240,7 @@ unregister:scsi_unregister (shpnt);continue ; - }; + }return count; }
@@ -1561,7 +1561,7 @@ static int aha1542_old_abort(Scsi_Cmnd * SCpnt)if (HOSTDATA (SCpnt->host)->mb[i].status) {printk (KERN_ERR "OGMB still full - restarting\n" );aha1542_out (SCpnt->host->io_port, &ahacmd,1 ); - }; + } }else printk(KERN_ERR "Other pending command %s\n", SCpnt->request->rq_disk ?
drivers/scsi/bfa/bfa_fcs_lport.c +1 -1
@@ -3548,7 +3548,7 @@ bfa_fcs_lport_ns_sm_online(struct bfa_fcs_lport_ns_s *ns,bfa_sm_set_state (ns, bfa_fcs_lport_ns_sm_sending_gid_ft);bfa_fcs_lport_ns_send_gid_ft (ns,NULL ); - }; + }break ;default :
drivers/scsi/bfa/bfa_fcs_rport.c +1 -1
@@ -2028,7 +2028,7 @@ bfa_fcs_rport_online_action(struct bfa_fcs_rport_s *rport)bfa_fcs_itnim_rport_online (rport->itnim);if (!BFA_FCS_PID_IS_WKA (rport->pid))bfa_fcs_rpf_rport_online (rport); - }; + }wwn2str (lpwwn_buf,bfa_fcs_lport_get_pwwn (port));wwn2str (rpwwn_buf, rport->pwwn);
drivers/scsi/nsp32.c +1 -1
@@ -1261,7 +1261,7 @@ static irqreturn_t do_nsp32_isr(int irq, void *dev_id)* ---> AutoSCSI with MSGOUTreg is processed. */ data->msgout_len =0 ; - }; + }nsp32_dbg (NSP32_DEBUG_INTR ,"MsgOut phase processed" ); }
drivers/scsi/sym53c8xx_2/sym_fw.c +1 -1
@@ -386,7 +386,7 @@ void sym_fw_bind_script(struct sym_hcb *np, u32 *start, int len) sym_name(np), (int) (cur-start)); ++cur;continue ; - }; + }/* * We use the bogus value 0xf00ff00f ;-)
drivers/scsi/ultrastor.c +1 -1
@@ -380,7 +380,7 @@ static int ultrastor_14f_detect(struct scsi_host_template * tpnt)if (!request_region (PORT_OVERRIDE ,0xc ,"ultrastor" )) {printk ("Ultrastor I/O space already in use\n" );return FALSE; - }; + } config.port_address =PORT_OVERRIDE ;#else for (i =0 ; i <ARRAY_SIZE (ultrastor_ports_14f); i++) {
drivers/usb/host/uhci-hcd.c +1 -1
@@ -806,7 +806,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.
drivers/video/cfbimgblt.c +1 -1
@@ -181,7 +181,7 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info * } shift += bpp; shift &= (32 -1 ); -if (!l) { l =8 ; s++; }; +if (!l) { l =8 ; s++; } }/* write trailing bits */
drivers/video/sysimgblt.c +1 -1
@@ -152,7 +152,7 @@ static void slow_imageblit(const struct fb_image *image, struct fb_info *p, } shift += bpp; shift &= (32 -1 ); -if (!l) { l =8 ; s++; }; +if (!l) { l =8 ; s++; } }/* write trailing bits */
fs/befs/btree.c +1 -1
@@ -500,7 +500,7 @@ befs_btree_read(struct super_block *sb, befs_data_stream * ds, "for key of size %d", bufsize, keylen);brelse (this_node->bh); goto error_alloc; - }; + }strncpy (keybuf, keystart, keylen); *value =fs64_to_cpu (sb, valarray[cur_key]);
fs/ext4/super.c +1 -1
@@ -3635,7 +3635,7 @@ no_journal:ext4_mb_release (sb);ext4_ext_release (sb); goto failed_mount4; - }; + }EXT4_SB (sb)->s_mount_state |=EXT4_ORPHAN_FS ;ext4_orphan_cleanup (sb, es);
fs/jffs2/wbuf.c +1 -1
@@ -1226,7 +1226,7 @@ int jffs2_dataflash_setup(struct jffs2_sb_info *c) {if ((c->flash_size % c->sector_size) !=0 ) { c->flash_size = (c->flash_size / c->sector_size) * c->sector_size;printk (KERN_WARNING "JFFS2 flash size adjusted to %dKiB\n" , c->flash_size); - }; + } c->wbuf_ofs =0xFFFFFFFF ; c->wbuf =kmalloc (c->wbuf_pagesize,GFP_KERNEL );
fs/ntfs/lcnalloc.c +1 -1
@@ -913,7 +913,7 @@ s64 __ntfs_cluster_free(ntfs_inode *ni, const VCN start_vcn, s64 count, }/* We have freed @to_free real clusters. */ real_freed = to_free; - }; + }/* Go to the next run and adjust the number of clusters left to free. */ ++rl;if (count >=0 )
fs/partitions/msdos.c +1 -1
@@ -90,7 +90,7 @@ static int aix_magic_present(struct parsed_partitions *state, unsigned char *p)if (d[0 ] =='_' && d[1 ] =='L' && d[2 ] =='V' && d[3 ] =='M' ) ret =1 ;put_dev_sector (sect); - }; + }return ret; }
fs/reiserfs/bitmap.c +1 -1
@@ -560,7 +560,7 @@ int reiserfs_parse_alloc_options(struct super_block *s, char *options)if (!strcmp (this_char,"displacing_new_packing_localities" )) {SET_OPTION (displacing_new_packing_localities);continue ; - }; + }if (!strcmp (this_char,"old_hashed_relocation" )) {SET_OPTION (old_hashed_relocation);
net/sunrpc/auth.c +1 -1
@@ -624,7 +624,7 @@ rpcauth_refreshcred(struct rpc_task *task)if (err <0 ) goto out; cred = task->tk_rqstp->rq_cred; - }; + }dprintk ("RPC: %5u refreshing %s cred %p\n" , task->tk_pid, cred->cr_auth->au_ops->au_name, cred);
sound/oss/sb_ess.c +6 -6
@@ -1109,10 +1109,10 @@ int ess_init(sb_devc * devc, struct address_info *hw_config) devc->submodel = submodel;sprintf (modelname,"ES%d" , devc->sbmo.esstype); chip = modelname; - }; + }if (chip ==NULL && (ess_minor &0x0f ) <8 ) { chip ="ES688" ; - }; + }#ifdef FKS_TEST FKS_test (devc);#endif
@@ -1122,7 +1122,7 @@ FKS_test (devc);*/ if (chip ==NULL && devc->sbmo.esstype ==ESSTYPE_LIKE20 ) { chip ="ES1688" ; - }; + }if (chip ==NULL ) {int type;
@@ -1151,7 +1151,7 @@ FKS_test (devc);printk ("ess_init: Unrecognized %04x\n" , type); } }; - }; + }#if 0 /* * this one failed:
@@ -1182,10 +1182,10 @@ FKS_test (devc); chip ="ES1788" ; devc->submodel =SUBMDL_ES1788 ; } - }; + }if (chip ==NULL ) { chip ="ES1688" ; - }; + }printk (KERN_INFO "ESS chip %s %s%s\n" , chip
sound/oss/sb_mixer.c +2 -2
@@ -410,7 +410,7 @@ static int set_recmask(sb_devc * devc, int mask)case MDL_SMW :if (devc->model ==MDL_ESS &&ess_set_recmask (devc, &devmask)) {break ; - }; + }if (devmask !=SOUND_MASK_MIC && devmask !=SOUND_MASK_LINE && devmask !=SOUND_MASK_CD )
@@ -666,7 +666,7 @@ static void sb_mixer_reset(sb_devc * devc)if (devc->model !=MDL_ESS || !ess_mixer_reset (devc)) {set_recmask (devc,SOUND_MASK_MIC ); - }; + } }int sb_mixer_init (sb_devc * devc,struct module *owner)
sound/oss/uart6850.c +1 -1
@@ -146,7 +146,7 @@ static int uart6850_open(int dev, int mode, {/* printk("Midi6850: Midi busy\n");*/ return -EBUSY ; - }; + }uart6850_cmd (UART_RESET );uart6850_input_loop ();
sound/pci/au88x0/au88x0_game.c +1 -1
@@ -99,7 +99,7 @@ static int __devinit vortex_gameport_register(vortex_t * vortex)if (!gp) {printk (KERN_ERR "vortex: cannot allocate memory for gameport\n" );return -ENOMEM ; - }; + }gameport_set_name (gp,"AU88x0 Gameport" );gameport_set_phys (gp,"pci%s/gameport0" ,pci_name (vortex->pci_dev));
Signature · 1 line
1.7.4.2.g597a6.dirty
PATCH 2/4 treewide: Remove unnecessary semicolons when while (foo) {...};
In reply to Joe PerchesDone via perl script:
$ cat remove_semi_while.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(while\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);
}
}$
One false positive removed.
--- arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- arch/arm/plat-mxc/ulpi.c | 2 +- arch/x86/pci/mmconfig-shared.c | 2 +- block/blk-core.c | 2 +- drivers/acpi/acpica/nsalloc.c | 2 +- drivers/char/nwbutton.c | 2 +- drivers/ide/ide-taskfile.c | 2 +- drivers/input/serio/serio_raw.c | 2 +- drivers/media/dvb/b2c2/flexcop-sram.c | 6 +++--- drivers/media/dvb/frontends/si21xx.c | 2 +- drivers/media/dvb/frontends/stv0299.c | 4 ++-- drivers/media/dvb/frontends/tda8083.c | 2 +- drivers/mtd/nand/mpc5121_nfc.c | 2 +- drivers/net/netxen/netxen_nic_init.c | 2 +- drivers/net/tokenring/3c359.c | 2 +- drivers/net/wireless/iwmc3200wifi/fw.c | 2 +- drivers/net/wireless/orinoco/main.c | 2 +- drivers/net/znet.c | 2 +- drivers/s390/net/qeth_core_main.c | 2 +- drivers/scsi/aha1542.c | 2 +- drivers/scsi/scsi_tgt_if.c | 2 +- drivers/scsi/sgiwd93.c | 2 +- drivers/scsi/sym53c8xx_2/sym_fw.c | 2 +- drivers/tty/serial/ucc_uart.c | 2 +- drivers/usb/misc/rio500.c | 2 +- drivers/usb/otg/ulpi_viewport.c | 2 +- drivers/uwb/i1480/dfu/mac.c | 2 +- drivers/video/sis/sis_accel.h | 14 +++++++------- fs/ntfs/super.c | 4 ++-- kernel/trace/ftrace.c | 2 +- lib/decompress_bunzip2.c | 2 +- net/bluetooth/hci_core.c | 4 ++-- tools/perf/builtin-lock.c | 2 +- tools/perf/util/trace-event-read.c | 2 +- 34 files changed, 45 insertions(+), 45 deletions(-)
arch/arm/mach-davinci/board-dm646x-evm.c +1 -1
@@ -192,7 +192,7 @@ static int evm_led_setup(struct i2c_client *client, int gpio,while (ngpio--) { leds->gpio = gpio++; leds++; - }; + } evm_led_dev =platform_device_alloc ("leds-gpio" ,0 ); platform_device_add_data(evm_led_dev, &evm_led_data,
arch/arm/plat-mxc/ulpi.c +1 -1
@@ -51,7 +51,7 @@ static int ulpi_poll(void __iomem *view, u32 bit)return 0 ;cpu_relax (); - }; + }printk (KERN_WARNING "timeout polling for ULPI device\n" );
arch/x86/pci/mmconfig-shared.c +1 -1
@@ -553,7 +553,7 @@ static int __init pci_parse_mcfg(struct acpi_table_header *header)while (i >=sizeof (struct acpi_mcfg_allocation )) { entries++; i -=sizeof (struct acpi_mcfg_allocation ); - }; + }if (entries ==0 ) { printk(KERN_ERR PREFIX "MMCONFIG has no entries\n");return -ENODEV ;
block/blk-core.c +1 -1
@@ -836,7 +836,7 @@ static struct request *get_request_wait(struct request_queue *q, int rw_flags,finish_wait (&rl->wait[is_sync], &wait); rq =get_request (q, rw_flags, bio,GFP_NOIO ); - }; + }return rq; }
drivers/acpi/acpica/nsalloc.c +1 -1
@@ -316,7 +316,7 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent_node) node_to_delete = next_node; next_node = next_node->peer;acpi_ns_delete_node (node_to_delete); - }; + }/* Clear the parent's child pointer */
drivers/char/nwbutton.c +1 -1
@@ -95,7 +95,7 @@ int button_del_callback (void (*callback) (void))return 0 ; } lp--; - }; + }return -EINVAL ; }
drivers/ide/ide-taskfile.c +1 -1
@@ -160,7 +160,7 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive)if ((stat &ATA_BUSY ) ==0 || retries-- ==0 )break ;udelay (10 ); - }; + }if (!OK_STAT (stat,ATA_DRDY ,BAD_STAT )) {if (custom && tf->command ==ATA_CMD_SET_MULTI ) {
drivers/input/serio/serio_raw.c +1 -1
@@ -215,7 +215,7 @@ static ssize_t serio_raw_write(struct file *file, const char __user *buffer, siz goto out; } written++; - }; + } out:mutex_unlock (&serio_raw_mutex);
drivers/media/dvb/b2c2/flexcop-sram.c +3 -3
@@ -85,7 +85,7 @@ static void flexcop_sram_write(struct adapter *adapter, u32 bank, u32 addr, u8 *while (((read_reg_dw (adapter,0x700 ) &0x80000000 ) !=0 ) && (retries >0 )) {mdelay (1 ); retries--; - }; + }if (retries ==0 )printk ("%s: SRAM timeout\n" , __func__);
@@ -110,7 +110,7 @@ static void flex_sram_read(struct adapter *adapter, u32 bank, u32 addr, u8 *buf,while (((read_reg_dw (adapter,0x700 ) &0x80000000 ) !=0 ) && (retries >0 )) {mdelay (1 ); retries--; - }; + }if (retries ==0 )printk ("%s: SRAM timeout\n" , __func__);
@@ -122,7 +122,7 @@ static void flex_sram_read(struct adapter *adapter, u32 bank, u32 addr, u8 *buf,while (((read_reg_dw (adapter,0x700 ) &0x80000000 ) !=0 ) && (retries >0 )) {mdelay (1 ); retries--; - }; + }if (retries ==0 )printk ("%s: SRAM timeout\n" , __func__);
drivers/media/dvb/frontends/si21xx.c +1 -1
@@ -343,7 +343,7 @@ static int si21xx_wait_diseqc_idle(struct si21xx_state *state, int timeout)return -ETIMEDOUT ; }msleep (10 ); - }; + }return 0 ; }
drivers/media/dvb/frontends/stv0299.c +2 -2
@@ -198,7 +198,7 @@ static int stv0299_wait_diseqc_fifo (struct stv0299_state* state, int timeout)return -ETIMEDOUT ; }msleep (10 ); - }; + }return 0 ; }
@@ -215,7 +215,7 @@ static int stv0299_wait_diseqc_idle (struct stv0299_state* state, int timeout)return -ETIMEDOUT ; }msleep (10 ); - }; + }return 0 ; }
drivers/media/dvb/frontends/tda8083.c +1 -1
@@ -175,7 +175,7 @@ static void tda8083_wait_diseqc_fifo (struct tda8083_state* state, int timeout) !(tda8083_readreg(state, 0x02) & 0x80)) {msleep (50 ); - }; + } }static int tda8083_set_tone (struct tda8083_state * state,fe_sec_tone_mode_t tone)
drivers/mtd/nand/mpc5121_nfc.c +1 -1
@@ -454,7 +454,7 @@ static void mpc5121_nfc_copy_spare(struct mtd_info *mtd, uint offset, buffer += blksize; offset += blksize; size -= blksize; - }; + } }/* Copy data from/to NFC main and spare buffers */
drivers/net/netxen/netxen_nic_init.c +1 -1
@@ -1279,7 +1279,7 @@ void netxen_free_dummy_dma(struct netxen_adapter *adapter)if (--i ==0 )break ; - }; + } }if (i) {
drivers/net/tokenring/3c359.c +1 -1
@@ -1773,7 +1773,7 @@ static void xl_wait_misr_flags(struct net_device *dev)if (readb (xl_mmio +MMIO_MACDATA ) !=0 ) {/* Misr not clear */ for (i=0 ; i<6 ; i++) {writel (MEM_BYTE_READ |0xDFFE0 | i, xl_mmio +MMIO_MAC_ACCESS_CMD ) ; -while (readb (xl_mmio +MMIO_MACDATA ) !=0 ) {} ;/* Empty Loop */ +while (readb (xl_mmio +MMIO_MACDATA ) !=0 ) {}/* Empty Loop */ } }
drivers/net/wireless/iwmc3200wifi/fw.c +1 -1
@@ -187,7 +187,7 @@ static int iwm_load_img(struct iwm_priv *iwm, const char *img_name)if (ret <0 ) goto err_release_fw; opcode_idx++; - }; + }/* Read firmware version */ fw_offset =iwm_fw_op_offset (iwm, fw,IWM_HDR_REC_OP_SW_VER ,0 );
drivers/net/wireless/orinoco/main.c +1 -1
@@ -1958,7 +1958,7 @@ irqreturn_t orinoco_interrupt(int irq, void *dev_id) evstat =hermes_read_regn (hw,EVSTAT ); events = evstat & hw->inten; - }; + }orinoco_unlock (priv, &flags);return IRQ_HANDLED ;
drivers/net/znet.c +1 -1
@@ -731,7 +731,7 @@ static void znet_rx(struct net_device *dev) cur_frame_end_offset -= ((count +1 )>>1 ) +3 ;if (cur_frame_end_offset <0 ) cur_frame_end_offset +=RX_BUF_SIZE /2 ; - }; + }/* Now step forward through the list. */ do {
drivers/s390/net/qeth_core_main.c +1 -1
@@ -1734,7 +1734,7 @@ int qeth_send_control_data(struct qeth_card *card, int len,if (time_after (jiffies, timeout)) goto time_err;cpu_relax (); - }; + } }if (reply->rc == -EIO )
drivers/scsi/aha1542.c +1 -1
@@ -555,7 +555,7 @@ static void aha1542_intr_handle(struct Scsi_Host *shost)far as queuecommand is concerned */ my_done (SCtmp); number_serviced++; - }; + } }static int aha1542_queuecommand_lck (Scsi_Cmnd * SCpnt,void (*done) (Scsi_Cmnd *))
drivers/scsi/scsi_tgt_if.c +1 -1
@@ -252,7 +252,7 @@ static ssize_t tgt_write(struct file *file, const char __user * buffer,tgt_ring_idx_inc (ring);event_recv_msg (ev); ev->hdr.status =0 ; - }; + }return count; }
drivers/scsi/sgiwd93.c +1 -1
@@ -187,7 +187,7 @@ static inline void init_hpc_chain(struct ip22_hostdata *hdata) hcp++; dma +=sizeof (struct hpc_chunk ); start +=sizeof (struct hpc_chunk ); - }; + } hcp--; hcp->desc.pnext = hdata->dma; }
drivers/scsi/sym53c8xx_2/sym_fw.c +1 -1
@@ -550,5 +550,5 @@ void sym_fw_bind_script(struct sym_hcb *np, u32 *start, int len) *cur++ =cpu_to_scr (new); } - }; + } }
drivers/tty/serial/ucc_uart.c +1 -1
@@ -267,7 +267,7 @@ static unsigned int qe_uart_tx_empty(struct uart_port *port)return 1 ; bdp++; - }; + } }/*
drivers/usb/misc/rio500.c +1 -1
@@ -330,7 +330,7 @@ write_rio(struct file *file, const char __user *buffer, thistime -= partial; }else break ; - }; + }if (result) {err ("Write Whoops - %x" , result); errn = -EIO ;
drivers/usb/otg/ulpi_viewport.c +1 -1
@@ -35,7 +35,7 @@ static int ulpi_viewport_wait(void __iomem *view, u32 mask)return 0 ;udelay (1 ); - }; + }return -ETIMEDOUT ; }
drivers/uwb/i1480/dfu/mac.c +1 -1
@@ -138,7 +138,7 @@ int fw_hdrs_load(struct i1480 *i1480, struct fw_hdr **phdr, *prev_hdr = hdr; prev_hdr = &hdr->next; hdr_cnt++; - }; + } *prev_hdr =NULL ;return 0 ;
drivers/video/sis/sis_accel.h +7 -7
@@ -153,9 +153,9 @@#define SiS300Idle \ { \ - while((MMIO_IN16(ivideo->mmio_vbase, BR(16)+2) & 0xE000) != 0xE000){}; \ - while((MMIO_IN16(ivideo->mmio_vbase, BR(16)+2) & 0xE000) != 0xE000){}; \ - while((MMIO_IN16(ivideo->mmio_vbase, BR(16)+2) & 0xE000) != 0xE000){}; \ + while((MMIO_IN16(ivideo->mmio_vbase, BR(16)+2) & 0xE000) != 0xE000){} \ + while((MMIO_IN16(ivideo->mmio_vbase, BR(16)+2) & 0xE000) != 0xE000){} \ + while((MMIO_IN16(ivideo->mmio_vbase, BR(16)+2) & 0xE000) != 0xE000){} \ CmdQueLen = MMIO_IN16(ivideo->mmio_vbase, 0x8240); \ }/* (do three times, because 2D engine seems quite unsure about whether or not it's idle) */
@@ -283,10 +283,10 @@#define SiS310Idle \ { \ - while( (MMIO_IN16(ivideo->mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){}; \ - while( (MMIO_IN16(ivideo->mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){}; \ - while( (MMIO_IN16(ivideo->mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){}; \ - while( (MMIO_IN16(ivideo->mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){}; \ + while( (MMIO_IN16(ivideo->mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){} \ + while( (MMIO_IN16(ivideo->mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){} \ + while( (MMIO_IN16(ivideo->mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){} \ + while( (MMIO_IN16(ivideo->mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){} \ CmdQueLen = 0; \ }
fs/ntfs/super.c +2 -2
@@ -1600,7 +1600,7 @@ read_partial_attrdef_page:memcpy ((u8 *)vol->attrdef + (index++ <<PAGE_CACHE_SHIFT ),page_address (page), size);ntfs_unmap_page (page); - }; + }if (size ==PAGE_CACHE_SIZE ) { size = i_size & ~PAGE_CACHE_MASK ;if (size)
@@ -1669,7 +1669,7 @@ read_partial_upcase_page:memcpy ((char *)vol->upcase + (index++ <<PAGE_CACHE_SHIFT ),page_address (page), size);ntfs_unmap_page (page); - }; + }if (size ==PAGE_CACHE_SIZE ) { size = i_size & ~PAGE_CACHE_MASK ;if (size)
kernel/trace/ftrace.c +1 -1
@@ -102,7 +102,7 @@ static void ftrace_list_func(unsigned long ip, unsigned long parent_ip)while (op != &ftrace_list_end) { op->func (ip, parent_ip); op =rcu_dereference_raw (op->next);/*see above*/ - }; + } }static void ftrace_pid_func (unsigned long ip,unsigned long parent_ip)
lib/decompress_bunzip2.c +1 -1
@@ -385,7 +385,7 @@ static int INIT get_next_block(struct bunzip_data *bd) bd->inbufBits = (bd->inbufBits <<8 )|bd->inbuf[bd->inbufPos++]; bd->inbufBitCount +=8 ; - }; + } bd->inbufBitCount -= hufGroup->maxLen; j = (bd->inbufBits >> bd->inbufBitCount)& ((1 << hufGroup->maxLen)-1 );
net/bluetooth/hci_core.c +2 -2
@@ -1463,7 +1463,7 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count) data += (count - rem); count = rem; - }; + }return rem; }
@@ -1498,7 +1498,7 @@ int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count) data += (count - rem); count = rem; - }; + }return rem; }
tools/perf/builtin-lock.c +1 -1
@@ -819,7 +819,7 @@ static void dump_threads(void) t =perf_session__findnew (session, st->tid);pr_info ("%10d: %s\n" , st->tid, t->comm); node =rb_next (node); - }; + } }static void dump_map (void )
tools/perf/util/trace-event-read.c +1 -1
@@ -102,7 +102,7 @@ static void skip(int size) r = size >BUFSIZ ?BUFSIZ : size;read_or_die (buf, r); size -= r; - }; + } }static unsigned int read4 (void )
Signature · 1 line
1.7.4.2.g597a6.dirty
PATCH 3/4 treewide: Remove unnecessary semicolons when for (foo) {...};
In reply to Joe PerchesDone via perl script:
$ cat remove_semi_for.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(for\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);
}
}$
One false positive removed.
--- arch/arm/mach-at91/gpio.c | 2 +- arch/arm/mach-omap1/devices.c | 2 +- arch/arm/plat-stmp3xxx/clock.c | 2 +- arch/ia64/kvm/vtlb.c | 4 ++-- arch/powerpc/boot/cuboot-c2k.c | 2 +- arch/s390/mm/extmem.c | 2 +- arch/x86/kernel/alternative.c | 4 ++-- drivers/acpi/apei/erst.c | 2 +- drivers/block/drbd/drbd_receiver.c | 2 +- drivers/isdn/hisax/netjet.c | 2 +- drivers/media/dvb/frontends/cx24110.c | 2 +- drivers/media/video/cx88/cx88-mpeg.c | 2 +- drivers/media/video/cx88/cx88-video.c | 2 +- drivers/net/ixgbe/ixgbe_common.c | 4 ++-- drivers/net/myri10ge/myri10ge.c | 2 +- drivers/net/ps3_gelic_net.c | 2 +- drivers/net/slhc.c | 2 +- drivers/rtc/rtc-isl12022.c | 2 +- drivers/rtc/rtc-pcf8563.c | 2 +- drivers/s390/char/monreader.c | 2 +- drivers/scsi/aha1542.c | 2 +- drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- drivers/scsi/nsp32.c | 2 +- drivers/uwb/ie.c | 2 +- drivers/video/matrox/matroxfb_DAC1064.c | 4 ++-- drivers/video/matrox/matroxfb_Ti3026.c | 2 +- sound/isa/wavefront/wavefront_synth.c | 2 +- sound/pci/mixart/mixart_hwdep.c | 2 +- 28 files changed, 32 insertions(+), 32 deletions(-)
arch/arm/mach-at91/gpio.c +1 -1
@@ -432,7 +432,7 @@ static int at91_gpio_show(struct seq_file *s, void *unused)seq_printf (s,"Pin\t" );for (bank =0 ; bank < gpio_banks; bank++) {seq_printf (s,"PIO%c\t" ,'A' + bank); - }; + }seq_printf (s,"\n\n" );/* print pin status */
arch/arm/mach-omap1/devices.c +1 -1
@@ -157,7 +157,7 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, size =OMAP1_MMC_SIZE ; omap_mmc_add("mmci-omap", i, base, size, irq, mmc_data[i]); - }; + } }#endif
arch/arm/plat-stmp3xxx/clock.c +1 -1
@@ -332,7 +332,7 @@ static int cpu_set_rate(struct clk *clk, u32 rate) }if (s2 ==0 )break ; - }; + }pr_debug ("%s: clkctrl_cpu %d, clkctrl_frac %d\n" , __func__, clkctrl_cpu, clkctrl_frac);if (c ==0x40 ) {
arch/ia64/kvm/vtlb.c +2 -2
@@ -489,7 +489,7 @@ void thash_purge_all(struct kvm_vcpu *v) head->itir =0 ; head->next =0 ; head++; - }; + } head = vhpt->hash;for (i =0 ; i < vhpt->num; i++) {
@@ -498,7 +498,7 @@ void thash_purge_all(struct kvm_vcpu *v) head->itir =0 ; head->next =0 ; head++; - }; + }local_flush_tlb_all (); }
arch/powerpc/boot/cuboot-c2k.c +1 -1
@@ -116,7 +116,7 @@ static void c2k_bridge_setup(u32 mem_size)cpu->pci<bus> mem0 */ out_le32 ((u32 *)(bridge_base + MV64x60_CPU_BAR_ENABLE), enables); - }; + } }static void c2k_fixups (void )
arch/s390/mm/extmem.c +1 -1
@@ -159,7 +159,7 @@ dcss_mkname(char *name, char *dcss_name)if (name[i] =='\0' )break ; dcss_name[i] =toupper (name[i]); - }; + }for (; i <8 ; i++) dcss_name[i] =' ' ;ASCEBC (dcss_name,8 );
arch/x86/kernel/alternative.c +2 -2
@@ -250,7 +250,7 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,/* turn DS segment override prefix into lock prefix */ if (*ptr ==0x3e )text_poke (ptr, ((unsigned char []){0xf0 }),1 ); - }; + }mutex_unlock (&text_mutex); }
@@ -271,7 +271,7 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,/* turn lock prefix into DS segment override prefix */ if (*ptr ==0xf0 )text_poke (ptr, ((unsigned char []){0x3E }),1 ); - }; + }mutex_unlock (&text_mutex); }
drivers/acpi/apei/erst.c +1 -1
@@ -704,7 +704,7 @@ static int __erst_read_from_storage(u64 record_id, u64 offset)break ;if (erst_timedout (&timeout,SPIN_UNIT ))return -EIO ; - }; + } rc =apei_exec_run (&ctx,ACPI_ERST_GET_COMMAND_STATUS );if (rc)return rc;
drivers/block/drbd/drbd_receiver.c +1 -1
@@ -537,7 +537,7 @@ static int drbd_recv(struct drbd_conf *mdev, void *buf, size_t size)/* D_ASSERT(signal_pending(current)); */ break ; } - }; + }set_fs (oldfs);
drivers/isdn/hisax/netjet.c +1 -1
@@ -332,7 +332,7 @@ static int make_raw_data_56k(struct BCState *bcs) { bitcnt =0 ; } val >>=1 ; - }; + } fcs =PPP_INITFCS ;for (i=0 ; i<bcs->tx_skb->len; i++) { val = bcs->tx_skb->data[i];
drivers/media/dvb/frontends/cx24110.c +1 -1
@@ -362,7 +362,7 @@ static int cx24110_initfe(struct dvb_frontend* fe)for (i =0 ; i <ARRAY_SIZE (cx24110_regdata); i++) {cx24110_writereg (state, cx24110_regdata[i].reg, cx24110_regdata[i].data); - }; + }return 0 ; }
drivers/media/video/cx88/cx88-mpeg.c +1 -1
@@ -448,7 +448,7 @@ static irqreturn_t cx8802_irq(int irq, void *dev_id)cx88_core_irq (core,status);if (status &PCI_INT_TSINT )cx8802_mpeg_irq (dev); - }; + }if (MAX_IRQ_LOOP == loop) {dprintk (0 ,"clearing mask\n" ); printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n",
drivers/media/video/cx88/cx88-video.c +1 -1
@@ -1679,7 +1679,7 @@ static irqreturn_t cx8800_irq(int irq, void *dev_id)cx88_core_irq (core,status);if (status &PCI_INT_VIDINT )cx8800_vid_irq (dev); - }; + }if (10 == loop) {printk (KERN_WARNING "%s/0: irq loop -- clearing mask\n" , core->name);
drivers/net/ixgbe/ixgbe_common.c +2 -2
@@ -927,7 +927,7 @@ static s32 ixgbe_ready_eeprom(struct ixgbe_hw *hw)udelay (5 );ixgbe_standby_eeprom (hw); - }; + }/* * On some parts, SPI write time could vary from 0-20mSec on 3.3V
@@ -1009,7 +1009,7 @@ static void ixgbe_shift_out_eeprom_bits(struct ixgbe_hw *hw, u16 data,* EEPROM */ mask = mask >>1 ; - }; + }/* We leave the "DI" bit set to "0" when we leave this routine. */ eec &= ~IXGBE_EEC_DI ;
drivers/net/myri10ge/myri10ge.c +1 -1
@@ -1013,7 +1013,7 @@ static int myri10ge_reset(struct myri10ge_priv *mgp) cmd.data2 = i; status |=myri10ge_send_cmd (mgp,MXGEFW_CMD_SET_INTRQ_DMA , &cmd,0 ); - }; + } status |=myri10ge_send_cmd (mgp,MXGEFW_CMD_GET_IRQ_ACK_OFFSET , &cmd,0 );
drivers/net/ps3_gelic_net.c +1 -1
@@ -1009,7 +1009,7 @@ static int gelic_card_decode_one_descr(struct gelic_card *card) netdev = card->netdev[i];break ; } - }; + }if (GELIC_PORT_MAX <= i) {pr_info ("%s: unknown packet vid=%x\n" , __func__, vid); goto refill;
drivers/net/slhc.c +1 -1
@@ -297,7 +297,7 @@ slhc_compress(struct slcompress *comp, unsigned char *icp, int isize, lcs = cs; cs = cs->next; comp->sls_o_searches++; - }; + }/* * Didn't find it -- re-use oldest cstate. Send an * uncompressed packet that tells the other side what
drivers/rtc/rtc-isl12022.c +1 -1
@@ -226,7 +226,7 @@ static int isl12022_set_datetime(struct i2c_client *client, struct rtc_time *tm) buf[ISL12022_REG_SC + i]);if (ret)return -EIO ; - }; + }return 0 ; }
drivers/rtc/rtc-pcf8563.c +1 -1
@@ -167,7 +167,7 @@ static int pcf8563_set_datetime(struct i2c_client *client, struct rtc_time *tm) __func__, err, data[0], data[1]);return -EIO ; } - }; + }return 0 ; }
drivers/s390/char/monreader.c +1 -1
@@ -95,7 +95,7 @@ static void dcss_mkname(char *ascii_name, char *ebcdic_name)if (ascii_name[i] =='\0' )break ; ebcdic_name[i] =toupper (ascii_name[i]); - }; + }for (; i <8 ; i++) ebcdic_name[i] =' ' ;ASCEBC (ebcdic_name,8 );
drivers/scsi/aha1542.c +1 -1
@@ -735,7 +735,7 @@ static void setup_mailboxes(int bse, struct Scsi_Host *shpnt)for (i =0 ; i <AHA1542_MAILBOXES ; i++) { mb[i].status = mb[AHA1542_MAILBOXES + i].status =0 ;any2scsi (mb[i].ccbptr,SCSI_BUF_PA (&ccb[i])); - }; + }aha1542_intr_reset (bse);/* reset interrupts, so they don't block */ any2scsi ((cmd +2 ),SCSI_BUF_PA (mb));aha1542_out (bse, cmd,5 );
drivers/scsi/ibmvscsi/ibmvstgt.c +1 -1
@@ -275,7 +275,7 @@ static int ibmvstgt_rdma(struct scsi_cmnd *sc, struct scatterlist *sg, int nsg,return -EIO ; } } - }; + } rest -= mlen; }
drivers/scsi/nsp32.c +1 -1
@@ -1883,7 +1883,7 @@ static void nsp32_msgout_occur(struct scsi_cmnd *SCpnt)nsp32_dbg (NSP32_DEBUG_MSGOUTOCCUR ,"bus: 0x%x\n" ,nsp32_read1 (base,SCSI_BUS_MONITOR )); - }; + } data->msgout_len =0 ;
drivers/uwb/ie.c +1 -1
@@ -90,7 +90,7 @@ int uwb_ie_dump_hex(const struct uwb_ie_hdr *ies, size_t len, r +=scnprintf (buf + r, size - r," %02x" , (unsigned )*d++);if (r < size) buf[r++] ='\n' ; - }; + }return r; }
drivers/video/matrox/matroxfb_DAC1064.c +2 -2
@@ -494,7 +494,7 @@ static int m1064_compute(void* out, struct my_timming* m) {if (inDAC1064 (minfo,M1064_XPIXPLLSTAT ) &0x40 )break ;udelay (10 ); - }; + }CRITEND
@@ -639,7 +639,7 @@ static void MGAG100_progPixClock(const struct matrox_fb_info *minfo, int flags,if (inDAC1064 (minfo,M1064_XPIXPLLSTAT ) &0x40 )break ;udelay (10 ); - }; + }if (!clk)printk (KERN_ERR "matroxfb: Pixel PLL%c not locked after usual time\n" , (reg-M1064_XPIXPLLAM -2 )/4 +'A' ); selClk =inDAC1064 (minfo,M1064_XPIXCLKCTRL ) & ~M1064_XPIXCLKCTRL_SRC_MASK ;
drivers/video/matrox/matroxfb_Ti3026.c +1 -1
@@ -473,7 +473,7 @@ static void ti3026_setMCLK(struct matrox_fb_info *minfo, int fout)if (inTi3026 (minfo,TVP3026_XPIXPLLDATA ) &0x40 )break ;udelay (10 ); - }; + }if (!tmout)printk (KERN_ERR "matroxfb: Temporary pixel PLL not locked after 5 secs\n" );
sound/isa/wavefront/wavefront_synth.c +1 -1
@@ -537,7 +537,7 @@ munge_int32 (unsigned int src,/* Note: we leave the upper bits in place */ dst++; - }; + }return dst; };
sound/pci/mixart/mixart_hwdep.c +1 -1
@@ -537,7 +537,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmwif ((err =snd_card_register (chip->card)) <0 )return err; - }; + }snd_printdd ("miXart firmware downloaded and successfully set up\n" );
Signature · 1 line
1.7.4.2.g597a6.dirty
PATCH 4/4 treewide: Remove unnecessary semicolons when switch (foo) {...};
In reply to Joe PerchesDone 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);
}
}$
--- arch/alpha/kernel/osf_sys.c | 2 +- arch/alpha/kernel/sys_eiger.c | 2 +- arch/arm/mach-omap2/board-flash.c | 2 +- arch/arm/mach-omap2/mux.c | 2 +- arch/arm/mach-omap2/pm-debug.c | 2 +- arch/arm/mach-s3c2410/mach-h1940.c | 2 +- arch/cris/arch-v32/drivers/cryptocop.c | 4 +- arch/ia64/kvm/vcpu.c | 2 +- arch/m68k/include/asm/sun3xflop.h | 4 +- arch/m68k/sun3/prom/console.c | 10 ++-- arch/m68k/sun3/prom/init.c | 2 +- arch/mips/oprofile/common.c | 2 +- arch/powerpc/include/asm/ps3.h | 2 +- arch/powerpc/platforms/ps3/system-bus.c | 4 +- arch/powerpc/platforms/pseries/eeh.c | 2 +- arch/sparc/include/asm/floppy_32.h | 8 ++-- arch/sparc/include/asm/floppy_64.h | 4 +- arch/sparc/include/asm/system_32.h | 2 +- arch/sparc/include/asm/system_64.h | 2 +- arch/sparc/kernel/apc.c | 2 +- arch/sparc/kernel/auxio_32.c | 2 +- arch/sparc/kernel/chmc.c | 2 +- arch/sparc/kernel/module.c | 2 +- arch/sparc/kernel/pci_common.c | 4 +- arch/sparc/kernel/pci_schizo.c | 6 +- arch/sparc/kernel/prom_irqtrans.c | 2 +- arch/sparc/kernel/psycho_common.c | 2 +- arch/sparc/kernel/sbus.c | 4 +- arch/sparc/kernel/setup_32.c | 2 +- arch/sparc/kernel/setup_64.c | 2 +- arch/sparc/kernel/smp_32.c | 6 +- arch/sparc/kernel/sys_sparc32.c | 2 +- arch/sparc/kernel/sys_sparc_64.c | 6 +- arch/sparc/kernel/time_64.c | 2 +- arch/sparc/kernel/traps_64.c | 2 +- arch/sparc/kernel/unaligned_64.c | 6 +- arch/sparc/kernel/us2e_cpufreq.c | 6 +- arch/sparc/kernel/us3_cpufreq.c | 4 +- arch/sparc/kernel/viohs.c | 2 +- arch/sparc/kernel/visemul.c | 14 +++--- arch/sparc/mm/fault_32.c | 2 +- arch/sparc/mm/init_32.c | 2 +- arch/sparc/mm/init_64.c | 6 +- arch/sparc/mm/srmmu.c | 4 +- arch/sparc/mm/sun4c.c | 8 ++-- arch/sparc/mm/tsb.c | 6 +- arch/sparc/prom/console_32.c | 2 +- arch/sparc/prom/init_32.c | 2 +- arch/sparc/prom/mp.c | 2 +- arch/x86/kernel/cpu/cpufreq/longhaul.c | 2 +- arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 2 +- arch/x86/kvm/vmx.c | 2 +- crypto/af_alg.c | 2 +- drivers/ata/pata_bf54x.c | 2 +- drivers/atm/firestream.c | 2 +- drivers/atm/horizon.c | 4 +- drivers/block/drbd/drbd_req.c | 2 +- drivers/block/sunvdc.c | 2 +- drivers/bluetooth/bfusb.c | 2 +- drivers/bluetooth/bluecard_cs.c | 2 +- drivers/bluetooth/bt3c_cs.c | 2 +- drivers/bluetooth/btuart_cs.c | 2 +- drivers/bluetooth/dtl1_cs.c | 2 +- drivers/bluetooth/hci_ldisc.c | 2 +- drivers/bluetooth/hci_ll.c | 2 +- drivers/bluetooth/hci_vhci.c | 2 +- drivers/char/rtc.c | 2 +- drivers/infiniband/hw/amso1100/c2_ae.c | 2 +- drivers/infiniband/hw/mthca/mthca_eq.c | 2 +- drivers/isdn/hisax/st5481.h | 2 +- drivers/isdn/pcbit/drv.c | 4 +- drivers/isdn/pcbit/layer2.h | 4 +- drivers/media/common/tuners/tda18271-common.c | 10 ++-- drivers/media/common/tuners/tuner-xc2028.c | 2 +- drivers/media/dvb/bt8xx/dst_ca.c | 2 +- drivers/media/dvb/dvb-core/dvb_frontend.c | 2 +- drivers/media/dvb/dvb-usb/af9015.c | 4 +- drivers/media/dvb/frontends/af9013.c | 6 +- drivers/media/dvb/frontends/bcm3510.c | 2 +- drivers/media/dvb/frontends/cx24110.c | 2 +- drivers/media/dvb/frontends/cx24123.c | 2 +- drivers/media/dvb/frontends/isl6405.c | 2 +- drivers/media/dvb/frontends/isl6421.c | 2 +- drivers/media/dvb/frontends/lnbp21.c | 4 +- drivers/media/dvb/frontends/si21xx.c | 2 +- drivers/media/dvb/frontends/sp8870.c | 6 +- drivers/media/dvb/frontends/sp887x.c | 6 +- drivers/media/dvb/frontends/stv0299.c | 2 +- drivers/media/dvb/frontends/tda8083.c | 6 +- drivers/media/radio/si470x/radio-si470x-common.c | 10 ++-- drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +- drivers/media/radio/si470x/radio-si470x-usb.c | 2 +- drivers/media/radio/si4713-i2c.c | 12 ++-- drivers/media/video/cx25840/cx25840-core.c | 2 +- drivers/media/video/cx88/cx88-dvb.c | 2 +- drivers/media/video/cx88/cx88-tvaudio.c | 4 +- drivers/media/video/omap3isp/ispccdc.c | 4 +- drivers/media/video/ov9640.c | 2 +- drivers/media/video/saa7134/saa7134-video.c | 2 +- drivers/media/video/tea6415c.c | 4 +- drivers/memstick/core/mspro_block.c | 2 +- drivers/memstick/host/jmb38x_ms.c | 2 +- drivers/memstick/host/tifm_ms.c | 2 +- drivers/mfd/tps65010.c | 2 +- drivers/misc/ti-st/st_core.c | 2 +- drivers/mmc/host/davinci_mmc.c | 2 +- drivers/mmc/host/wbsd.c | 2 +- drivers/net/enic/enic_main.c | 2 +- drivers/net/irda/via-ircc.h | 2 +- drivers/net/iseries_veth.c | 4 +- drivers/net/ixgbe/ixgbe_82599.c | 4 +- drivers/net/sungem.c | 2 +- drivers/net/tokenring/ibmtr.c | 2 +- drivers/net/tun.c | 2 +- drivers/net/wireless/b43/main.c | 2 +- drivers/net/wireless/b43legacy/main.c | 2 +- drivers/net/wireless/rt2x00/rt2800lib.c | 2 +- drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- drivers/nfc/pn544.c | 4 +- drivers/pci/proc.c | 2 +- drivers/pci/syscall.c | 2 +- drivers/pcmcia/db1xxx_ss.c | 2 +- drivers/pcmcia/m8xx_pcmcia.c | 2 +- drivers/rtc/rtc-rs5c372.c | 2 +- drivers/s390/net/ctcm_fsms.c | 2 +- drivers/s390/scsi/zfcp_fc.h | 2 +- drivers/s390/scsi/zfcp_fsf.c | 2 +- drivers/sbus/char/display7seg.c | 2 +- drivers/sbus/char/envctrl.c | 8 ++-- drivers/sbus/char/openprom.c | 6 +- drivers/scsi/aha1542.c | 6 +- drivers/scsi/fnic/fnic_main.c | 2 +- drivers/scsi/ibmvscsi/ibmvfc.c | 36 +++++++------- drivers/scsi/ipr.c | 4 +- drivers/scsi/ipr.h | 2 +- drivers/scsi/pmcraid.c | 2 +- drivers/scsi/qlogicpti.c | 2 +- drivers/scsi/sym53c8xx_2/sym_fw.c | 2 +- drivers/tty/nozomi.c | 6 +- drivers/tty/serial/bfin_5xx.c | 4 +- drivers/tty/serial/ip22zilog.c | 2 +- drivers/tty/serial/pmac_zilog.c | 2 +- drivers/tty/serial/sunsab.c | 2 +- drivers/tty/serial/sunsu.c | 2 +- drivers/tty/serial/sunzilog.c | 6 +- drivers/usb/core/hcd.c | 2 +- drivers/usb/core/hub.c | 2 +- drivers/usb/gadget/composite.c | 2 +- drivers/usb/gadget/dummy_hcd.c | 6 +- drivers/usb/gadget/goku_udc.c | 2 +- drivers/usb/gadget/langwell_udc.c | 2 +- drivers/usb/gadget/net2280.c | 4 +- drivers/usb/gadget/rndis.c | 2 +- drivers/usb/host/ehci-dbg.c | 2 +- drivers/usb/host/isp116x.h | 2 +- drivers/usb/host/isp1362-hcd.c | 2 +- drivers/usb/host/ohci-dbg.c | 2 +- drivers/usb/host/sl811-hcd.c | 4 +- drivers/usb/host/whci/hcd.c | 4 +- drivers/usb/misc/usbtest.c | 2 +- drivers/usb/musb/musb_core.c | 4 +- drivers/usb/musb/musb_gadget.c | 2 +- drivers/usb/musb/musb_host.c | 4 +- drivers/usb/otg/twl4030-usb.c | 2 +- drivers/usb/wusbcore/cbaf.c | 4 +- drivers/usb/wusbcore/devconnect.c | 2 +- drivers/usb/wusbcore/wa-xfer.c | 4 +- drivers/vbus/pci-bridge.c | 2 +- drivers/video/cg14.c | 4 +- drivers/video/cg6.c | 2 +- drivers/video/leo.c | 2 +- drivers/video/nvidia/nv_hw.c | 2 +- drivers/video/sbuslib.c | 2 +- drivers/video/tcx.c | 4 +- drivers/watchdog/riowd.c | 2 +- fs/9p/vfs_inode.c | 2 +- fs/btrfs/print-tree.c | 2 +- fs/gfs2/inode.c | 2 +- fs/gfs2/ops_inode.c | 2 +- fs/gfs2/recovery.c | 2 +- fs/lockd/clnt4xdr.c | 4 +- fs/lockd/clntxdr.c | 4 +- fs/nfs/nfs2xdr.c | 10 ++-- fs/nfs/nfs3xdr.c | 56 +++++++++++----------- fs/nfs/nfs4proc.c | 2 +- fs/nfs/nfs4state.c | 2 +- fs/nfs/super.c | 4 +- fs/nfsd/nfs4callback.c | 2 +- fs/nfsd/nfs4state.c | 2 +- fs/notify/fanotify/fanotify.c | 2 +- fs/notify/inotify/inotify_fsnotify.c | 2 +- fs/ocfs2/cluster/quorum.c | 2 +- fs/ocfs2/dlmglue.c | 2 +- fs/ubifs/sb.c | 2 +- include/linux/hp_sdc.h | 2 +- include/net/sctp/sctp.h | 4 +- kernel/audit_watch.c | 2 +- kernel/res_counter.c | 2 +- kernel/smp.c | 2 +- net/batman-adv/hard-interface.c | 2 +- security/selinux/hooks.c | 2 +- sound/drivers/vx/vx_pcm.c | 2 +- sound/oss/sb_ess.c | 10 ++-- sound/pci/asihpi/asihpi.c | 2 +- sound/pci/emu10k1/emupcm.c | 2 +- sound/pci/intel8x0.c | 2 +- sound/sparc/amd7930.c | 4 +- sound/sparc/dbri.c | 2 +- 208 files changed, 359 insertions(+), 359 deletions(-)
arch/alpha/kernel/osf_sys.c +1 -1
@@ -522,7 +522,7 @@ SYSCALL_DEFINE2(osf_proplist_syscall, enum pl_code, code,default : error = -EOPNOTSUPP ;break ; - }; + }return error; }
arch/alpha/kernel/sys_eiger.c +1 -1
@@ -177,7 +177,7 @@ eiger_swizzle(struct pci_dev *dev, u8 *pinp)case 0x03 : bridge_count =2 ;break ;/* 2 */ case 0x07 : bridge_count =3 ;break ;/* 3 */ case 0x0f : bridge_count =4 ;break ;/* 4 */ - }; + } slot =PCI_SLOT (dev->devfn);while (dev->bus->self) {
arch/arm/mach-omap2/board-flash.c +1 -1
@@ -232,7 +232,7 @@ void board_flash_init(struct flash_partitions partition_info[],if (onenandcs >GPMC_CS_NUM ) onenandcs = cs;break ; - }; + } cs++; }
arch/arm/mach-omap2/mux.c +1 -1
@@ -407,7 +407,7 @@ void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state)default :/* Nothing to be done */ break ; - }; + }if (val >=0 ) { omap_mux_write(pad->partition, val,
arch/arm/mach-omap2/pm-debug.c +1 -1
@@ -466,7 +466,7 @@ static int pm_dbg_open(struct inode *inode, struct file *file)default :return single_open (file, pm_dbg_show_timers, &inode->i_private); - }; + } }static int pm_dbg_reg_open (struct inode *inode,struct file *file)
arch/arm/mach-s3c2410/mach-h1940.c +1 -1
@@ -462,7 +462,7 @@ static void h1940_set_mmc_power(unsigned char power_mode, unsigned short vdd)break ;default :break ; - }; + } }static struct s3c24xx_mci_pdata h1940_mmc_cfg__initdata = {
arch/cris/arch-v32/drivers/cryptocop.c +2 -2
@@ -1775,7 +1775,7 @@ static void get_aes_decrypt_key(unsigned char *dec_key, const unsigned char *kebreak ;default :panic ("stream co-processor: bad aes key length in get_aes_decrypt_key\n" ); - }; + }/* Need to do host byte order correction here since key is byte oriented and the * kx algorithm is word (u32) oriented. */
@@ -3014,7 +3014,7 @@ static int cryptocop_ioctl_create_session(struct inode *inode, struct file *filpdefault :DEBUG_API (printk ("create session, bad cipher algorithm %d\n" , sop.cipher));return -EINVAL ; - }; + }DEBUG (printk ("setting cipher transform %d\n" , ti_cipher.alg));copy_from_user (ti_cipher.key, sop.key, sop.keylen/8 ); ti_cipher.keylen = sop.keylen;
arch/ia64/kvm/vcpu.c +1 -1
@@ -2026,7 +2026,7 @@ void kvm_emulate(struct kvm_vcpu *vcpu, struct kvm_pt_regs *regs)break ;default :break ; - }; + }/*Assume all status is NO_FAULT ?*/ if (status ==IA64_NO_FAULT && cause !=EVENT_RFI )vcpu_increment_iip (vcpu);
arch/m68k/include/asm/sun3xflop.h +2 -2
@@ -62,7 +62,7 @@ static unsigned char sun3x_82072_fd_inb(int port)return 0x80 ; }return 0 ; - }; + }panic ("sun_82072_fd_inb: How did I get here?" ); }
@@ -106,7 +106,7 @@ static void sun3x_82072_fd_outb(unsigned char value, int port)case 4 :/* FD_STATUS */ *(sun3x_fdc.status_r) = value;break ; - }; + }return ; }
arch/m68k/sun3/prom/console.c +5 -5
@@ -80,7 +80,7 @@ prom_query_input_device()case PROMDEV_TTYB :return PROMDEV_ITTYB ;default :return PROMDEV_I_UNK ; - }; + }case PROM_V3 :case PROM_P1275 :local_irq_save (flags);
@@ -104,7 +104,7 @@ prom_query_input_device() return PROMDEV_ITTYB; }return PROMDEV_I_UNK ; - }; + } }#endif
@@ -126,7 +126,7 @@ prom_query_output_device()case PROMDEV_SCREEN :return PROMDEV_OSCREEN ;case PROMDEV_TTYA :return PROMDEV_OTTYA ;case PROMDEV_TTYB :return PROMDEV_OTTYB ; - }; + }break ;case PROM_V2 :case PROM_V3 :
@@ -161,10 +161,10 @@ prom_query_output_device()switch (*romvec->pv_stdin) {case PROMDEV_TTYA :return PROMDEV_OTTYA ;case PROMDEV_TTYB :return PROMDEV_OTTYB ; - }; + } }break ; - }; + }return PROMDEV_O_UNK ; }#endif
arch/m68k/sun3/prom/init.c +1 -1
@@ -53,7 +53,7 @@ void __init prom_init(struct linux_romvec *rp) romvec->pv_romvers);prom_halt ();break ; - }; + } prom_rev = romvec->pv_plugin_revision; prom_prev = romvec->pv_printrev;
arch/mips/oprofile/common.c +1 -1
@@ -98,7 +98,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)case CPU_LOONGSON2 : lmodel = &op_model_loongson2_ops;break ; - }; + }if (!lmodel)return -ENODEV ;
arch/powerpc/include/asm/ps3.h +1 -1
@@ -306,7 +306,7 @@ static inline const char* ps3_result(int result)default :BUG (); return "** unknown result **"; - }; + }#else return "" ;#endif
arch/powerpc/platforms/ps3/system-bus.c +2 -2
@@ -613,7 +613,7 @@ static dma_addr_t ps3_ioc0_map_page(struct device *_dev, struct page *page,default :/* not happned */ BUG (); - }; + } result =ps3_dma_map (dev->d_region, (unsigned long )ptr, size, &bus_addr, iopte_flag);
@@ -764,7 +764,7 @@ int ps3_system_bus_device_register(struct ps3_system_bus_device *dev)break ;default :BUG (); - }; + } dev->core.of_node =NULL ;set_dev_node (&dev->core,0 );
arch/powerpc/platforms/pseries/eeh.c +1 -1
@@ -728,7 +728,7 @@ int pcibios_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state statbreak ;default :return -EINVAL ; - }; + }return 0 ; }
arch/sparc/include/asm/floppy_32.h +4 -4
@@ -138,7 +138,7 @@ static unsigned char sun_82072_fd_inb(int port)return sun_fdc->data_82072;case 7 :/* FD_DIR */ return sun_read_dir (); - }; + }panic ("sun_82072_fd_inb: How did I get here?" ); }
@@ -161,7 +161,7 @@ static void sun_82072_fd_outb(unsigned char value, int port)case 4 :/* FD_STATUS */ sun_fdc->status_82072 = value;break ; - }; + }return ; }
@@ -186,7 +186,7 @@ static unsigned char sun_82077_fd_inb(int port)return sun_fdc->data_82077;case 7 :/* FD_DIR */ return sun_read_dir (); - }; + }panic ("sun_82077_fd_inb: How did I get here?" ); }
@@ -212,7 +212,7 @@ static void sun_82077_fd_outb(unsigned char value, int port)case 3 :/* FD_TDR */ sun_fdc->tapectl_82077 = value;break ; - }; + }return ; }
arch/sparc/include/asm/floppy_64.h +2 -2
@@ -111,7 +111,7 @@ static unsigned char sun_82077_fd_inb(unsigned long port)case 7 :/* FD_DIR */ /* XXX: Is DCL on 0x80 in sun4m? */ return sbus_readb (&sun_fdc->dir_82077); - }; + }panic ("sun_82072_fd_inb: How did I get here?" ); }
@@ -135,7 +135,7 @@ static void sun_82077_fd_outb(unsigned char value, unsigned long port)case 4 :/* FD_STATUS */ sbus_writeb (value, &sun_fdc->status_82077);break ; - }; + }return ; }
arch/sparc/include/asm/system_32.h +1 -1
@@ -225,7 +225,7 @@ static inline unsigned long __xchg(unsigned long x, __volatile__ void * ptr, intswitch (size) {case 4 :return xchg_u32 (ptr, x); - }; + }__xchg_called_with_bad_pointer ();return x; }
arch/sparc/include/asm/system_64.h +1 -1
@@ -238,7 +238,7 @@ static inline unsigned long __xchg(unsigned long x, __volatile__ void * ptr,return xchg32 (ptr, x);case 8 :return xchg64 (ptr, x); - }; + }__xchg_called_with_bad_pointer ();return x; }
arch/sparc/kernel/apc.c +1 -1
@@ -123,7 +123,7 @@ static long apc_ioctl(struct file *f, unsigned int cmd, unsigned long __arg)default :return -EINVAL ; - }; + }return 0 ; }
arch/sparc/kernel/auxio_32.c +1 -1
@@ -101,7 +101,7 @@ void set_auxio(unsigned char bits_on, unsigned char bits_off)break ;default :panic ("Can't set AUXIO register on this machine." ); - }; + }spin_unlock_irqrestore (&auxio_lock, flags); }EXPORT_SYMBOL (set_auxio);
arch/sparc/kernel/chmc.c +1 -1
@@ -664,7 +664,7 @@ static void chmc_interpret_one_decode_reg(struct chmc *p, int which_bank, u64 vacase 0x0 : bp->interleave =16 ;break ; - }; + }/* UK[10] is reserved, and UK[11] is not set for the SDRAM * bank size definition.
arch/sparc/kernel/module.c +1 -1
@@ -214,7 +214,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs, me->name, (int) (ELF_R_TYPE(rel[i].r_info) & 0xff));return -ENOEXEC ; - }; + } }return 0 ; }
arch/sparc/kernel/pci_common.c +2 -2
@@ -281,7 +281,7 @@ static int sun4v_read_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,case 4 : *value = ret &0xffffffff ;break ; - }; + }return PCIBIOS_SUCCESSFUL ;
@@ -456,7 +456,7 @@ void pci_determine_mem_io_space(struct pci_pbm_info *pbm)default :break ; - }; + } }if (!saw_io || !saw_mem) {
arch/sparc/kernel/pci_schizo.c +3 -3
@@ -264,7 +264,7 @@ static void schizo_check_iommu_error_pbm(struct pci_pbm_info *pbm,default : type_string ="ECC Error" ;break ; - }; + }printk ("%s: IOMMU Error, type[%s]\n" , pbm->name, type_string);
@@ -319,7 +319,7 @@ static void schizo_check_iommu_error_pbm(struct pci_pbm_info *pbm,default : type_string ="ECC Error" ;break ; - }; + } printk("%s: IOMMU TAG(%d)[error(%s) ctx(%x) wr(%d) str(%d) " "sz(%dK) vpg(%08lx)]\n", pbm->name, i, type_string,
@@ -1328,7 +1328,7 @@ static int __devinit schizo_pbm_init(struct pci_pbm_info *pbm,default : chipset_name ="SCHIZO" ;break ; - }; + }/* For SCHIZO, three OBP regs: * 1) PBM controller regs
arch/sparc/kernel/prom_irqtrans.c +1 -1
@@ -694,7 +694,7 @@ static unsigned int sbus_of_build_irq(struct device_node *dp,case 3 : iclr = reg_base +SYSIO_ICLR_SLOT3 ;break ; - }; + } iclr += ((unsigned long )sbus_level -1UL ) *8UL ; }
arch/sparc/kernel/psycho_common.c +1 -1
@@ -228,7 +228,7 @@ void psycho_check_iommu_error(struct pci_pbm_info *pbm,default : type_str ="ECC Error" ;break ; - }; + }printk (KERN_ERR "%s: IOMMU Error, type[%s]\n" , pbm->name, type_str);
arch/sparc/kernel/sbus.c +2 -2
@@ -97,7 +97,7 @@ void sbus_set_sbus64(struct device *dev, int bursts)default :return ; - }; + } val =upa_readq (cfg_reg);if (val & (1UL <<14UL )) {
@@ -244,7 +244,7 @@ static unsigned int sbus_build_irq(struct platform_device *op, unsigned int ino)case 3 : iclr = reg_base +SYSIO_ICLR_SLOT3 ;break ; - }; + } iclr += ((unsigned long )sbus_level -1UL ) *8UL ; }
arch/sparc/kernel/setup_32.c +1 -1
@@ -260,7 +260,7 @@ void __init setup_arch(char **cmdline_p)default :printk ("UNKNOWN!\n" );break ; - }; + }#ifdef CONFIG_DUMMY_CONSOLE conswitchp = &dummy_con;
arch/sparc/kernel/setup_64.c +1 -1
@@ -209,7 +209,7 @@ void __init per_cpu_patch(void)default :prom_printf ("Unknown cpu type, halting.\n" );prom_halt (); - }; + } *(unsigned int *) (addr +0 ) = insns[0 ];wmb ();
arch/sparc/kernel/smp_32.c +3 -3
@@ -112,7 +112,7 @@ void __init smp_cpus_done(unsigned int max_cpus)printk ("UNKNOWN!\n" );BUG ();break ; - }; + } }void cpu_panic (void )
@@ -325,7 +325,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)printk ("UNKNOWN!\n" );BUG ();break ; - }; + } }/* Set this up early so that things like the scheduler can init
@@ -398,7 +398,7 @@ int __cpuinit __cpu_up(unsigned int cpu)printk ("UNKNOWN!\n" );BUG ();break ; - }; + }if (!ret) {cpu_set (cpu, smp_commenced_mask);
arch/sparc/kernel/sys_sparc32.c +1 -1
@@ -109,7 +109,7 @@ asmlinkage long compat_sys_ipc(u32 call, u32 first, u32 second, u32 third, compadefault :return -ENOSYS ; - }; + }return -ENOSYS ; }
arch/sparc/kernel/sys_sparc_64.c +3 -3
@@ -460,7 +460,7 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, seconddefault : err = -ENOSYS ; goto out; - }; + } }if (call <=MSGCTL ) {switch (call) {
@@ -481,7 +481,7 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, seconddefault : err = -ENOSYS ; goto out; - }; + } }if (call <=SHMCTL ) {switch (call) {
@@ -507,7 +507,7 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, seconddefault : err = -ENOSYS ; goto out; - }; + } }else { err = -ENOSYS ; }
arch/sparc/kernel/time_64.c +1 -1
@@ -708,7 +708,7 @@ static void sparc64_timer_setup(enum clock_event_mode mode,case CLOCK_EVT_MODE_UNUSED :WARN_ON (1 );break ; - }; + } }static struct clock_event_device sparc64_clockevent = {
arch/sparc/kernel/traps_64.c +1 -1
@@ -1804,7 +1804,7 @@ static const char *sun4v_err_type_to_str(u32 type)return "warning resumable" ;default :return "unknown" ; - }; + } }static void sun4v_log_error (struct pt_regs *regs,struct sun4v_error_entry *ent,int cpu,const char *pfx,atomic_t *ocnt)
arch/sparc/kernel/unaligned_64.c +3 -3
@@ -211,7 +211,7 @@ static inline int do_int_store(int reg_num, int size, unsigned long *dst_addr,default :BUG ();break ; - }; + } }return __do_int_store (dst_addr, size, src_val, asi); }
@@ -328,7 +328,7 @@ asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn)case ASI_SNFL : asi &= ~0x08 ;break ; - }; + }switch (dir) {case load: reg_addr =fetch_reg_addr (((insn>>25 )&0x1f ), regs);
@@ -351,7 +351,7 @@ asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn)default :BUG ();break ; - }; + } *reg_addr = val_in; }break ;
arch/sparc/kernel/us2e_cpufreq.c +3 -3
@@ -176,7 +176,7 @@ static unsigned long index_to_estar_mode(unsigned int index)default :BUG (); - }; + } }static unsigned long index_to_divisor (unsigned int index)
@@ -199,7 +199,7 @@ static unsigned long index_to_divisor(unsigned int index)default :BUG (); - }; + } }static unsigned long estar_to_divisor (unsigned long estar)
@@ -224,7 +224,7 @@ static unsigned long estar_to_divisor(unsigned long estar)break ;default :BUG (); - }; + }return ret; }
arch/sparc/kernel/us3_cpufreq.c +2 -2
@@ -71,7 +71,7 @@ static unsigned long get_current_freq(unsigned int cpu, unsigned long safari_cfgbreak ;default :BUG (); - }; + }return ret; }
@@ -125,7 +125,7 @@ static void us3_set_cpu_divider_index(unsigned int cpu, unsigned int index)default :BUG (); - }; + } reg =read_safari_cfg ();
arch/sparc/kernel/viohs.c +1 -1
@@ -363,7 +363,7 @@ static int process_ver(struct vio_driver_state *vio, struct vio_ver_info *pkt)default :return handshake_failure (vio); - }; + } }static int process_attr (struct vio_driver_state *vio,void *pkt)
arch/sparc/kernel/visemul.c +7 -7
@@ -334,7 +334,7 @@ static void edge(struct pt_regs *regs, unsigned int insn, unsigned int opf) left = edge32_tab_l[(rs1 >>2 ) &0x1 ].left; right = edge32_tab_l[(rs2 >>2 ) &0x1 ].right;break ; - }; + }if ((rs1 & ~0x7UL ) == (rs2 & ~0x7UL )) rd_val = right & left;
@@ -360,7 +360,7 @@ static void edge(struct pt_regs *regs, unsigned int insn, unsigned int opf) tstate = regs->tstate & ~(TSTATE_XCC |TSTATE_ICC ); regs->tstate = tstate | (ccr <<32UL ); } - }; + } }static void array (struct pt_regs *regs,unsigned int insn,unsigned int opf)
@@ -392,7 +392,7 @@ static void array(struct pt_regs *regs, unsigned int insn, unsigned int opf)case ARRAY32_OPF : rd_val <<=2 ; - }; + }store_reg (regs, rd_val,RD (insn)); }
@@ -577,7 +577,7 @@ static void pformat(struct pt_regs *regs, unsigned int insn, unsigned int opf) *fpd_regaddr (f,RD (insn)) = rd_val;break ; } - }; + } }static void pmul (struct pt_regs *regs,unsigned int insn,unsigned int opf)
@@ -693,7 +693,7 @@ static void pmul(struct pt_regs *regs, unsigned int insn, unsigned int opf) *fpd_regaddr (f,RD (insn)) = rd_val;break ; } - }; + } }static void pcmp (struct pt_regs *regs,unsigned int insn,unsigned int opf)
@@ -786,7 +786,7 @@ static void pcmp(struct pt_regs *regs, unsigned int insn, unsigned int opf) rd_val |=1 << i; }break ; - }; + }maybe_flush_windows (0 ,0 ,RD (insn),0 );store_reg (regs, rd_val,RD (insn));
@@ -885,7 +885,7 @@ int vis_emul(struct pt_regs *regs, unsigned int insn)case BSHUFFLE_OPF :bshuffle (regs, insn);break ; - }; + } regs->tpc = regs->tnpc; regs->tnpc +=4 ;
arch/sparc/mm/fault_32.c +1 -1
@@ -135,7 +135,7 @@ asmlinkage int lookup_fault(unsigned long pc, unsigned long ret_pc,default :break ; - }; + }memset (®s,0 ,sizeof (regs)); regs.pc = pc;
arch/sparc/mm/init_32.c +1 -1
@@ -342,7 +342,7 @@ void __init paging_init(void)prom_printf ("paging_init: sparc_cpu_model = %d\n" , sparc_cpu_model);prom_printf ("paging_init: Halting...\n" );prom_halt (); - }; + }/* Initialize the protection map with non-constant, MMU dependent values. */ protection_map[0 ] =PAGE_NONE ;
arch/sparc/mm/init_64.c +3 -3
@@ -1625,7 +1625,7 @@ static void __init sun4v_ktsb_init(void) ktsb_descr[0 ].pgsz_idx =HV_PGSZ_IDX_4MB ; ktsb_descr[0 ].pgsz_mask =HV_PGSZ_MASK_4MB ;break ; - }; + } ktsb_descr[0 ].assoc =1 ; ktsb_descr[0 ].num_ttes =KERNEL_TSB_NENTRIES ;
@@ -2266,7 +2266,7 @@ unsigned long pte_sz_bits(unsigned long sz)return _PAGE_SZ512K_4V;case 4 *1024 *1024 :return _PAGE_SZ4MB_4V; - }; + } }else {switch (sz) {case 8 *1024 :
@@ -2278,7 +2278,7 @@ unsigned long pte_sz_bits(unsigned long sz)return _PAGE_SZ512K_4U;case 4 *1024 *1024 :return _PAGE_SZ4MB_4U; - }; + } } }
arch/sparc/mm/srmmu.c +2 -2
@@ -1665,7 +1665,7 @@ static void __init init_swift(void)default : srmmu_modtype = Swift_ok;break ; - }; + }BTFIXUPSET_CALL (flush_cache_all, swift_flush_cache_all,BTFIXUPCALL_NORM );BTFIXUPSET_CALL (flush_cache_mm, swift_flush_cache_mm,BTFIXUPCALL_NORM );
@@ -2069,7 +2069,7 @@ static void __init get_srmmu_type(void)/* Some other Cypress revision, assume a 605. */ init_cypress_605 (mod_rev);break ; - }; + }return ; }
arch/sparc/mm/sun4c.c +4 -4
@@ -318,7 +318,7 @@ void __init sun4c_probe_vac(void)prom_printf ("probe_vac: Didn't expect vac-linesize of %d, halting\n" , sun4c_vacinfo.linesize);prom_halt (); - }; + }sun4c_flush_all ();sun4c_enable_vac ();
@@ -364,7 +364,7 @@ static void __init patch_kernel_fault_handler(void)prom_printf ("Unhandled number of segmaps: %d\n" , num_segmaps);prom_halt (); - }; + }switch (num_contexts) {case 8 :/* Default, nothing to do. */
@@ -377,7 +377,7 @@ static void __init patch_kernel_fault_handler(void)prom_printf ("Unhandled number of contexts: %d\n" , num_contexts);prom_halt (); - }; + }if (sun4c_vacinfo.do_hwflushes !=0 ) {PATCH_INSN (vac_hwflush_patch1_on, vac_hwflush_patch1);
@@ -394,7 +394,7 @@ static void __init patch_kernel_fault_handler(void)prom_printf ("Impossible VAC linesize %d, halting...\n" , sun4c_vacinfo.linesize);prom_halt (); - }; + } } }
arch/sparc/mm/tsb.c +3 -3
@@ -179,7 +179,7 @@ static void setup_tsb_params(struct mm_struct *mm, unsigned long tsb_idx, unsignprintk (KERN_ERR "TSB[%s:%d]: Impossible TSB size %lu, killing process.\n" , current->comm, current->pid, tsb_bytes);do_exit (SIGSEGV ); - }; + } tte |=pte_sz_bits (page_sz);if (tlb_type == cheetah_plus || tlb_type == hypervisor) {
@@ -214,7 +214,7 @@ static void setup_tsb_params(struct mm_struct *mm, unsigned long tsb_idx, unsign#endif default :BUG (); - }; + } hp->assoc =1 ; hp->num_ttes = tsb_bytes /16 ; hp->ctx_idx =0 ;
@@ -229,7 +229,7 @@ static void setup_tsb_params(struct mm_struct *mm, unsigned long tsb_idx, unsign#endif default :BUG (); - }; + } hp->tsb_base = tsb_paddr; hp->resv =0 ; }
arch/sparc/prom/console_32.c +1 -1
@@ -38,7 +38,7 @@ static int prom_nbputchar(const char *buf)break ;default :break ; - }; + }restore_current ();spin_unlock_irqrestore (&prom_lock, flags);return i;/* Ugh, we could spin forever on unsupported proms ;( */
arch/sparc/prom/init_32.c +1 -1
@@ -53,7 +53,7 @@ void __init prom_init(struct linux_romvec *rp) romvec->pv_romvers);prom_halt ();break ; - }; + } prom_rev = romvec->pv_plugin_revision; prom_prev = romvec->pv_printrev;
arch/sparc/prom/mp.c +1 -1
@@ -35,7 +35,7 @@ prom_startcpu(int cpunode, struct linux_prom_registers *ctable_reg, int ctx, chacase PROM_V3 : ret = (*(romvec->v3_cpustart))(cpunode, (int ) ctable_reg, ctx, pc);break ; - }; + }restore_current ();spin_unlock_irqrestore (&prom_lock, flags);
arch/x86/kernel/cpu/cpufreq/longhaul.c +1 -1
@@ -878,7 +878,7 @@ static int __cpuinit longhaul_cpu_init(struct cpufreq_policy *policy)case TYPE_POWERSAVER :printk (KERN_CONT "Powersaver supported.\n" );break ; - }; + }/* Doesn't hurt */ longhaul_setup_southbridge ();
arch/x86/kernel/cpu/cpufreq/speedstep-lib.c +1 -1
@@ -242,7 +242,7 @@ unsigned int speedstep_get_frequency(enum speedstep_processor processor)return pentium3_get_frequency (processor);default :return 0 ; - }; + }return 0 ; }EXPORT_SYMBOL_GPL (speedstep_get_frequency);
arch/x86/kvm/vmx.c +1 -1
@@ -3265,7 +3265,7 @@ static int handle_cr(struct kvm_vcpu *vcpu) vcpu->run->exit_reason =KVM_EXIT_SET_TPR ;return 0 ; } - }; + }break ;case 2 :/* clts */ vmx_set_cr0 (vcpu,kvm_read_cr0_bits (vcpu, ~X86_CR0_TS ));
crypto/af_alg.c +1 -1
@@ -437,7 +437,7 @@ int af_alg_wait_for_completion(int err, struct af_alg_completion *completion)INIT_COMPLETION (completion->completion); err = completion->err;break ; - }; + }return err; }
drivers/ata/pata_bf54x.c +1 -1
@@ -1687,7 +1687,7 @@ static int __init bfin_atapi_init(void)break ;default : bfin_port_info[0 ].udma_mask =ATA_UDMA5 ; - }; + }return platform_driver_register (&bfin_atapi_driver); }
drivers/atm/firestream.c +1 -1
@@ -1081,7 +1081,7 @@ static int fs_open(struct atm_vcc *atm_vcc)RC_FLAGS_BFPS_BFP * bfp | RC_FLAGS_RXBM_PSB, 0, 0);break ; - }; + }if (IS_FS50 (dev)) { submit_command (dev, &dev->hp_txq, QE_CMD_REG_WR | QE_CMD_IMM_INQ,
drivers/atm/horizon.c +2 -2
@@ -2582,7 +2582,7 @@ static int hrz_getsockopt (struct atm_vcc * atm_vcc, int level, int optname,default :return -ENOPROTOOPT ;break ; - }; + }break ; }return -EINVAL ;
@@ -2602,7 +2602,7 @@ static int hrz_setsockopt (struct atm_vcc * atm_vcc, int level, int optname,default :return -ENOPROTOOPT ;break ; - }; + }break ; }return -EINVAL ;
drivers/block/drbd/drbd_req.c +1 -1
@@ -727,7 +727,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, req->rq_state |= (RQ_NET_OK |RQ_NET_DONE );_req_may_be_done_not_susp (req, m);break ; - }; + }return rv; }
drivers/block/sunvdc.c +1 -1
@@ -519,7 +519,7 @@ static int generic_request(struct vdc_port *port, u8 op, void *buf, int len)case VD_OP_SET_EFI :return -EOPNOTSUPP ;break ; - }; + } map_perm |=LDC_MAP_SHADOW |LDC_MAP_DIRECT |LDC_MAP_IO ;
drivers/bluetooth/bfusb.c +1 -1
@@ -495,7 +495,7 @@ static int bfusb_send_frame(struct sk_buff *skb)case HCI_SCODATA_PKT : hdev->stat.sco_tx++;break ; - }; + }/* Prepend skb with frame type */ memcpy (skb_push (skb,1 ), &bt_cb (skb)->pkt_type,1 );
drivers/bluetooth/bluecard_cs.c +1 -1
@@ -679,7 +679,7 @@ static int bluecard_hci_send_frame(struct sk_buff *skb)case HCI_SCODATA_PKT : hdev->stat.sco_tx++;break ; - }; + }/* Prepend skb with frame type */ memcpy (skb_push (skb,1 ), &bt_cb (skb)->pkt_type,1 );
drivers/bluetooth/bt3c_cs.c +1 -1
@@ -440,7 +440,7 @@ static int bt3c_hci_send_frame(struct sk_buff *skb)case HCI_SCODATA_PKT : hdev->stat.sco_tx++;break ; - }; + }/* Prepend skb with frame type */ memcpy (skb_push (skb,1 ), &bt_cb (skb)->pkt_type,1 );
drivers/bluetooth/btuart_cs.c +1 -1
@@ -447,7 +447,7 @@ static int btuart_hci_send_frame(struct sk_buff *skb)case HCI_SCODATA_PKT : hdev->stat.sco_tx++;break ; - }; + }/* Prepend skb with frame type */ memcpy (skb_push (skb,1 ), &bt_cb (skb)->pkt_type,1 );
drivers/bluetooth/dtl1_cs.c +1 -1
@@ -416,7 +416,7 @@ static int dtl1_hci_send_frame(struct sk_buff *skb)break ;default :return -EILSEQ ; - }; + } nsh.zero =0 ; nsh.len = skb->len;
drivers/bluetooth/hci_ldisc.c +1 -1
@@ -500,7 +500,7 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file * file,default : err =n_tty_ioctl_helper (tty, file, cmd, arg);break ; - }; + }return err; }
drivers/bluetooth/hci_ll.c +1 -1
@@ -481,7 +481,7 @@ static int ll_recv(struct hci_uart *hu, void *data, int count) hu->hdev->stat.err_rx++; ptr++; count--;continue ; - }; + } ptr++; count--;
drivers/bluetooth/hci_vhci.c +1 -1
@@ -159,7 +159,7 @@ static inline ssize_t vhci_put_user(struct vhci_data *data,case HCI_SCODATA_PKT : data->hdev->stat.sco_tx++;break ; - }; + }return total; }
drivers/char/rtc.c +1 -1
@@ -411,7 +411,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)case RTC_IRQP_READ :case RTC_IRQP_SET : return -EINVAL; - }; + } }#endif
drivers/infiniband/hw/amso1100/c2_ae.c +1 -1
@@ -141,7 +141,7 @@ static const char *to_qp_state_str(int state)return "C2_QP_STATE_ERROR" ;default :return "<invalid QP state>" ; - }; + } }void c2_ae_event (struct c2_dev *c2dev,u32 mq_index)
drivers/infiniband/hw/mthca/mthca_eq.c +1 -1
@@ -357,7 +357,7 @@ static int mthca_eq_int(struct mthca_dev *dev, struct mthca_eq *eq)mthca_warn (dev,"Unhandled event %02x(%02x) on EQ %d\n" , eqe->type, eqe->subtype, eq->eqn);break ; - }; + }set_eqe_hw (eqe); ++eq->cons_index;
drivers/isdn/hisax/st5481.h +1 -1
@@ -513,7 +513,7 @@ static inline const char *ST5481_CMD_string(int evt)case ST5481_CMD_AR10 :return "AR10" ;case ST5481_CMD_ARL :return "ARL" ;case ST5481_CMD_PDN :return "PDN" ; - }; + }sprintf (s,"0x%x" ,evt);return s;
drivers/isdn/pcbit/drv.c +2 -2
@@ -284,7 +284,7 @@ static int pcbit_command(isdn_ctrl* ctl)default :printk (KERN_DEBUG "pcbit_command: unknown command\n" );break ; - }; + }return 0 ; }
@@ -968,7 +968,7 @@ static int pcbit_ioctl(isdn_ctrl* ctl)default :printk ("error: unknown ioctl\n" );break ; - }; + }return 0 ; }
drivers/isdn/pcbit/layer2.h +2 -2
@@ -196,7 +196,7 @@ static __inline__ void pcbit_writew(struct pcbit_dev *dev, unsigned short dt)writew (dt, dev->writeptr); dev->writeptr +=2 ;break ; - }; + } } static __inline__ void memcpy_topcbit(struct pcbit_dev * dev, u_char * data,
@@ -253,7 +253,7 @@ static __inline__ unsigned short pcbit_readw(struct pcbit_dev *dev) val =readw (dev->readptr); dev->readptr +=2 ;break ; - }; + }return val; }
drivers/media/common/tuners/tda18271-common.c +5 -5
@@ -275,7 +275,7 @@ int tda18271_init_regs(struct dvb_frontend *fe)case TDA18271HDC2 : regs[R_ID ] =0x84 ;break ; - }; + } regs[R_TM ] =0x08 ; regs[R_PL ] =0x80 ;
@@ -300,7 +300,7 @@ int tda18271_init_regs(struct dvb_frontend *fe)case TDA18271HDC2 : regs[R_EB1 ] =0xfc ;break ; - }; + } regs[R_EB2 ] =0x01 ; regs[R_EB3 ] =0x84 ;
@@ -320,7 +320,7 @@ int tda18271_init_regs(struct dvb_frontend *fe)case TDA18271HDC2 : regs[R_EB12 ] =0x33 ;break ; - }; + } regs[R_EB13 ] =0xc1 ; regs[R_EB14 ] =0x00 ;
@@ -335,7 +335,7 @@ int tda18271_init_regs(struct dvb_frontend *fe)case TDA18271HDC2 : regs[R_EB18 ] =0x8c ;break ; - }; + } regs[R_EB19 ] =0x00 ; regs[R_EB20 ] =0x20 ;
@@ -347,7 +347,7 @@ int tda18271_init_regs(struct dvb_frontend *fe)case TDA18271HDC2 : regs[R_EB21 ] =0xb3 ;break ; - }; + } regs[R_EB22 ] =0x48 ; regs[R_EB23 ] =0xb0 ;
drivers/media/common/tuners/tuner-xc2028.c +1 -1
@@ -1127,7 +1127,7 @@ static int xc2028_set_params(struct dvb_frontend *fe,break ;default :tuner_err ("error: bandwidth not supported.\n" ); - }; + }/* Selects between D2633 or D2620 firmware.
drivers/media/dvb/bt8xx/dst_ca.c +1 -1
@@ -647,7 +647,7 @@ static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioctdprintk (verbose,DST_CA_INFO ,1 ," -->CA_SET_PID Success !" );default : result = -EOPNOTSUPP ; - }; + } free_mem_and_exit:kfree (p_ca_message);kfree (p_ca_slot_info);
drivers/media/dvb/dvb-core/dvb_frontend.c +1 -1
@@ -1884,7 +1884,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file, fepriv->tune_mode_flags = (unsigned long ) parg; err =0 ;break ; - }; + }if (fe->dvb->fe_ioctl_override) { cb_err = fe->dvb->fe_ioctl_override(fe, cmd, parg,
drivers/media/dvb/dvb-usb/af9015.c +2 -2
@@ -900,7 +900,7 @@ static int af9015_read_config(struct usb_device *udev)case 3 : af9015_af9013_config[i].adc_clock =25000 ;break ; - }; + }deb_info ("%s: [%d] xtal:%d set adc_clock:%d\n" , __func__, i, val, af9015_af9013_config[i].adc_clock);
@@ -961,7 +961,7 @@ static int af9015_read_config(struct usb_device *udev)default :warn ("tuner id:%d not supported, please report!" , val);return -ENODEV ; - }; + } af9015_af9013_config[i].tuner = val;deb_info ("%s: [%d] tuner id:%d\n" , __func__, i, val);
drivers/media/dvb/frontends/af9013.c +3 -3
@@ -176,7 +176,7 @@ static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval)err ("invalid gpio:%d\n" , gpio); ret = -EINVAL ; goto error; - }; + }switch (gpio) {case 0 :
@@ -188,7 +188,7 @@ static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval)default : pos =4 ;break ; - }; + } ret =af9013_write_reg_bits (state, addr, pos,4 , gpioval);
@@ -448,7 +448,7 @@ static int af9013_set_ofdm_params(struct af9013_state *state,default :deb_info ("%s: invalid hierarchy_information\n" , __func__); *auto_mode =1 ; - }; + }switch (params->constellation) {case QAM_AUTO :
drivers/media/dvb/frontends/bcm3510.c +1 -1
@@ -525,7 +525,7 @@ static int bcm3510_set_frontend(struct dvb_frontend* fe, cmd.ACQUIRE1.IF_FREQ =0x0 ;default :return -EINVAL ; - }; + } cmd.ACQUIRE0.OFFSET =0 ; cmd.ACQUIRE0.NTSCSWEEP =1 ; cmd.ACQUIRE0.FA =1 ;
drivers/media/dvb/frontends/cx24110.c +1 -1
@@ -378,7 +378,7 @@ static int cx24110_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltagreturn cx24110_writereg (state,0x76 ,(cx24110_readreg (state,0x76 )&0x3b )|0x40 );default :return -EINVAL ; - }; + } }static int cx24110_diseqc_send_burst (struct dvb_frontend * fe,fe_sec_mini_cmd_t burst)
drivers/media/dvb/frontends/cx24123.c +1 -1
@@ -754,7 +754,7 @@ static int cx24123_set_voltage(struct dvb_frontend *fe,return 0 ;default :return -EINVAL ; - }; + }return 0 ; }
drivers/media/dvb/frontends/isl6405.c +1 -1
@@ -77,7 +77,7 @@ static int isl6405_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltagebreak ;default :return -EINVAL ; - }; + } } isl6405->config |= isl6405->override_or; isl6405->config &= isl6405->override_and;
drivers/media/dvb/frontends/isl6421.c +1 -1
@@ -63,7 +63,7 @@ static int isl6421_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltagebreak ;default :return -EINVAL ; - }; + } isl6421->config |= isl6421->override_or; isl6421->config &= isl6421->override_and;
drivers/media/dvb/frontends/lnbp21.c +2 -2
@@ -65,7 +65,7 @@ static int lnbp21_set_voltage(struct dvb_frontend *fe,break ;default :return -EINVAL ; - }; + } lnbp21->config |= lnbp21->override_or; lnbp21->config &= lnbp21->override_and;
@@ -108,7 +108,7 @@ static int lnbp21_set_tone(struct dvb_frontend *fe,break ;default :return -EINVAL ; - }; + } lnbp21->config |= lnbp21->override_or; lnbp21->config &= lnbp21->override_and;
drivers/media/dvb/frontends/si21xx.c +1 -1
@@ -472,7 +472,7 @@ static int si21xx_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t volt)break ;default :return -EINVAL ; - }; + } }static int si21xx_init (struct dvb_frontend *fe)
drivers/media/dvb/frontends/sp8870.c +3 -3
@@ -188,7 +188,7 @@ static int configure_reg0xc05 (struct dvb_frontend_parameters *p, u16 *reg0xc05)break ;default :return -EINVAL ; - }; + }switch (p->u.ofdm.hierarchy_information) {case HIERARCHY_NONE :
@@ -207,7 +207,7 @@ static int configure_reg0xc05 (struct dvb_frontend_parameters *p, u16 *reg0xc05)break ;default :return -EINVAL ; - }; + }switch (p->u.ofdm.code_rate_HP) {case FEC_1_2 :
@@ -229,7 +229,7 @@ static int configure_reg0xc05 (struct dvb_frontend_parameters *p, u16 *reg0xc05)break ;default :return -EINVAL ; - }; + }if (known_parameters) *reg0xc05 |= (2 <<1 );/* use specified parameters */
drivers/media/dvb/frontends/sp887x.c +3 -3
@@ -229,7 +229,7 @@ static int configure_reg0xc05 (struct dvb_frontend_parameters *p, u16 *reg0xc05)break ;default :return -EINVAL ; - }; + }switch (p->u.ofdm.hierarchy_information) {case HIERARCHY_NONE :
@@ -248,7 +248,7 @@ static int configure_reg0xc05 (struct dvb_frontend_parameters *p, u16 *reg0xc05)break ;default :return -EINVAL ; - }; + }switch (p->u.ofdm.code_rate_HP) {case FEC_1_2 :
@@ -270,7 +270,7 @@ static int configure_reg0xc05 (struct dvb_frontend_parameters *p, u16 *reg0xc05)break ;default :return -EINVAL ; - }; + }if (known_parameters) *reg0xc05 |= (2 <<1 );/* use specified parameters */
drivers/media/dvb/frontends/stv0299.c +1 -1
@@ -386,7 +386,7 @@ static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltagbreak ;default :return -EINVAL ; - }; + }if (state->config->op0_off) reg0x0c &= ~0x10 ;
drivers/media/dvb/frontends/tda8083.c +3 -3
@@ -189,7 +189,7 @@ static int tda8083_set_tone (struct tda8083_state* state, fe_sec_tone_mode_t tonreturn tda8083_writereg (state,0x29 ,0x80 );default :return -EINVAL ; - }; + } }static int tda8083_set_voltage (struct tda8083_state * state,fe_sec_voltage_t voltage)
@@ -201,7 +201,7 @@ static int tda8083_set_voltage (struct tda8083_state* state, fe_sec_voltage_t voreturn tda8083_writereg (state,0x20 ,0x11 );default :return -EINVAL ; - }; + } }static int tda8083_send_diseqc_burst (struct tda8083_state * state,fe_sec_mini_cmd_t burst)
@@ -215,7 +215,7 @@ static int tda8083_send_diseqc_burst (struct tda8083_state* state, fe_sec_mini_cbreak ;default :return -EINVAL ; - }; + }tda8083_wait_diseqc_fifo (state,100 );
drivers/media/radio/si470x/radio-si470x-common.c +5 -5
@@ -219,7 +219,7 @@ static int si470x_get_freq(struct si470x_device *radio, unsigned int *freq)/* 2: 50 kHz */ default : spacing =0.050 *FREQ_MUL ;break ; - }; + }/* Bottom of Band (MHz) */ switch ((radio->registers[SYSCONFIG2 ] &SYSCONFIG2_BAND ) >>6 ) {
@@ -232,7 +232,7 @@ static int si470x_get_freq(struct si470x_device *radio, unsigned int *freq)/* 2: 76 - 90 MHz (Japan) */ case 2 : band_bottom =76 *FREQ_MUL ;break ; - }; + }/* read channel */ retval =si470x_get_register (radio,READCHAN );
@@ -264,7 +264,7 @@ int si470x_set_freq(struct si470x_device *radio, unsigned int freq)/* 2: 50 kHz */ default : spacing =0.050 *FREQ_MUL ;break ; - }; + }/* Bottom of Band (MHz) */ switch ((radio->registers[SYSCONFIG2 ] &SYSCONFIG2_BAND ) >>6 ) {
@@ -277,7 +277,7 @@ int si470x_set_freq(struct si470x_device *radio, unsigned int freq)/* 2: 76 - 90 MHz (Japan) */ case 2 : band_bottom =76 *FREQ_MUL ;break ; - }; + }/* Chan = [ Freq (Mhz) - Bottom of Band (MHz) ] / Spacing (kHz) */ chan = (freq - band_bottom) / spacing;
@@ -707,7 +707,7 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv, tuner->rangelow =76 *FREQ_MUL ; tuner->rangehigh =90 *FREQ_MUL ;break ; - }; + }/* stereo indicator == stereo (instead of mono) */ if ((radio->registers[STATUSRSSI ] &STATUSRSSI_ST ) ==0 )
drivers/media/radio/si470x/radio-si470x-i2c.c +1 -1
@@ -312,7 +312,7 @@ static void si470x_i2c_interrupt_work(struct work_struct *work) READCHAN_BLERD) >> 10; rds = radio->registers[RDSD ];break ; - }; + }/* Fill the V4L2 RDS buffer */ put_unaligned_le16 (rds, &tmpbuf);
drivers/media/radio/si470x/radio-si470x-usb.c +1 -1
@@ -460,7 +460,7 @@ static void si470x_int_in_callback(struct urb *urb) READCHAN_BLERD) >> 10; rds = radio->registers[RDSD ];break ; - }; + }/* Fill the V4L2 RDS buffer */ put_unaligned_le16 (rds, &tmpbuf);
drivers/media/radio/si4713-i2c.c +6 -6
@@ -1008,7 +1008,7 @@ static int si4713_choose_econtrol_action(struct si4713_device *sdev, u32 id,default : rval = -EINVAL ; - }; + }return rval; }
@@ -1080,7 +1080,7 @@ static int si4713_write_econtrol_string(struct si4713_device *sdev,default : rval = -EINVAL ;break ; - }; + } exit:return rval;
@@ -1129,7 +1129,7 @@ static int si4713_write_econtrol_tune(struct si4713_device *sdev,default : rval = -EINVAL ; goto unlock; - }; + }if (sdev->power_state) rval =si4713_tx_tune_power (sdev, power, antcap);
@@ -1419,7 +1419,7 @@ static int si4713_read_econtrol_string(struct si4713_device *sdev,default : rval = -EINVAL ;break ; - }; + } exit:return rval;
@@ -1472,7 +1472,7 @@ static int si4713_read_econtrol_tune(struct si4713_device *sdev,break ;default : rval = -EINVAL ; - }; + } unlock:mutex_unlock (&sdev->mutex);
@@ -1697,7 +1697,7 @@ static int si4713_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)default : rval = -EINVAL ;break ; - }; + }return rval; }
drivers/media/video/cx25840/cx25840-core.c +1 -1
@@ -578,7 +578,7 @@ static void cx23885_initialize(struct i2c_client *client)cx25840_write4 (client,0x114 ,0x01bf0c9e );cx25840_write4 (client,0x110 ,0x000a030c );break ; - }; + }/* ADC2 input select */ cx25840_write (client,0x102 ,0x10 );
drivers/media/video/cx88/cx88-dvb.c +1 -1
@@ -859,7 +859,7 @@ static int samsung_smt_7020_set_voltage(struct dvb_frontend *fe,break ;default :return -EINVAL ; - }; + }return (i2c_transfer (&dev->core->i2c_adap, &msg,1 ) ==1 ) ?0 : -EIO ; }
drivers/media/video/cx88/cx88-tvaudio.c +2 -2
@@ -373,7 +373,7 @@ static void set_audio_standard_NICAM(struct cx88_core *core, u32 mode)set_audio_registers (core, nicam_bgdki_common);set_audio_registers (core, nicam_default);break ; - }; + } mode |=EN_DMTRX_LR |EN_DMTRX_BYPASS ;set_audio_finish (core, mode);
@@ -639,7 +639,7 @@ static void set_audio_standard_A2(struct cx88_core *core, u32 mode)dprintk ("%s Warning: wrong value\n" , __func__);return ;break ; - }; + } mode |=EN_FMRADIO_EN_RDS |EN_DMTRX_SUMDIFF ;set_audio_finish (core, mode);
drivers/media/video/omap3isp/ispccdc.c +2 -2
@@ -824,7 +824,7 @@ static void ccdc_config_vp(struct isp_ccdc_device *ccdc)case 13 : fmtcfg_vp |=ISPCCDC_FMTCFG_VPIN_12_3 ;break ; - }; + }if (pipe->input) div =DIV_ROUND_UP (l3_ick, pipe->max_rate);
@@ -980,7 +980,7 @@ static void ccdc_config_sync_if(struct isp_ccdc_device *ccdc,case 12 : syn_mode |=ISPCCDC_SYN_MODE_DATSIZ_12 ;break ; - }; + }if (syncif->fldmode) syn_mode |=ISPCCDC_SYN_MODE_FLDMODE ;
drivers/media/video/ov9640.c +1 -1
@@ -442,7 +442,7 @@ static void ov9640_alter_regs(enum v4l2_mbus_pixelcode code, alt->com13 =OV9640_COM13_RGB_AVG ; alt->com15 =OV9640_COM15_RGB_565 ;break ; - }; + } }/* Setup registers according to resolution and color encoding */
drivers/media/video/saa7134/saa7134-video.c +1 -1
@@ -1204,7 +1204,7 @@ int saa7134_s_ctrl_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, strbreak ;default :/* nothing */ ; - }; + }switch (c->id) {case V4L2_CID_BRIGHTNESS : dev->ctl_bright = c->value;
drivers/media/video/tea6415c.c +2 -2
@@ -81,7 +81,7 @@ static int tea6415c_s_routing(struct v4l2_subdev *sd,case 13 : byte =0x28 ;break ; - }; + }switch (i) {case 5 :
@@ -108,7 +108,7 @@ static int tea6415c_s_routing(struct v4l2_subdev *sd,case 11 : byte |=0x07 ;break ; - }; + } ret =i2c_smbus_write_byte (client, byte);if (ret) {
drivers/memstick/core/mspro_block.c +1 -1
@@ -281,7 +281,7 @@ static const char *mspro_block_attr_name(unsigned char tag)return "attr_devinfo" ;default :return NULL ; - }; + } } typedef ssize_t (*sysfs_show_t)(struct device *dev,
drivers/memstick/host/jmb38x_ms.c +1 -1
@@ -754,7 +754,7 @@ static int jmb38x_ms_set_param(struct memstick_host *msh, clock_delay); host->ifmode = value;break ; - }; + }return 0 ; }
drivers/memstick/host/tifm_ms.c +1 -1
@@ -532,7 +532,7 @@ static int tifm_ms_set_param(struct memstick_host *msh, }else return -EINVAL ;break ; - }; + }return 0 ; }
drivers/mfd/tps65010.c +1 -1
@@ -147,7 +147,7 @@ static void dbg_chgconf(int por, char *buf, size_t len, u8 chgconfig)case 2 : p =75 ;break ;case 1 : p =50 ;break ;default : p =25 ;break ; - }; p; }), + } p; }), (chgconfig &TPS_VBUS_CHARGING ) ? ((chgconfig &TPS_VBUS_500MA ) ?500 :100 ) : 0,
drivers/misc/ti-st/st_core.c +1 -1
@@ -347,7 +347,7 @@ void st_int_recv(void *disc_data, st_gdata->rx_state =ST_W4_HEADER ; st_gdata->rx_count = st_gdata->list[type]->hdr_len;pr_debug ("rx_count %ld\n" , st_gdata->rx_count); - }; + } ptr++; count--; }
drivers/mmc/host/davinci_mmc.c +1 -1
@@ -297,7 +297,7 @@ static void mmc_davinci_start_command(struct mmc_davinci_host *host,default : s =", (R? response)" ;break ; - }; s; })); + } s; })); host->cmd = cmd;switch (mmc_resp_type (cmd)) {
drivers/mmc/host/wbsd.c +1 -1
@@ -810,7 +810,7 @@ static void wbsd_request(struct mmc_host *mmc, struct mmc_request *mrq) cmd->error = -EINVAL ; goto done; - }; + } }/*
drivers/net/enic/enic_main.c +1 -1
@@ -1618,7 +1618,7 @@ static void enic_notify_timer_start(struct enic *enic)default :/* Using intr for notification for INTx/MSI-X */ break ; - }; + } }/* rtnl lock is held, process context */
drivers/net/irda/via-ircc.h +1 -1
@@ -210,7 +210,7 @@ static void DisableDmaChannel(unsigned int channel)break ;default :break ; - };//Switch + }//Switch }static unsigned char ReadLPCReg (int iRegNum)
drivers/net/iseries_veth.c +2 -2
@@ -538,7 +538,7 @@ static void veth_handle_ack(struct veth_lpevent *event)default :veth_error ("Unknown ack type %d from LPAR %d.\n" , event->base_event.xSubtype, rlp); - }; + } }static void veth_handle_int (struct veth_lpevent *event)
@@ -584,7 +584,7 @@ static void veth_handle_int(struct veth_lpevent *event)default :veth_error ("Unknown interrupt type %d from LPAR %d.\n" , event->base_event.xSubtype, rlp); - }; + } }static void veth_handle_event (struct HvLpEvent *event)
drivers/net/ixgbe/ixgbe_82599.c +2 -2
@@ -1147,7 +1147,7 @@ s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 pballoc)default :/* bad value */ return IXGBE_ERR_CONFIG ; - }; + }/* Move the flexible bytes to use the ethertype - shift 6 words */ fdirctrl |= (0x6 <<IXGBE_FDIRCTRL_FLEX_SHIFT );
@@ -1235,7 +1235,7 @@ s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 pballoc)default :/* bad value */ return IXGBE_ERR_CONFIG ; - }; + }/* Turn perfect match filtering on */ fdirctrl |=IXGBE_FDIRCTRL_PERFECT_MATCH ;
drivers/net/sungem.c +1 -1
@@ -2825,7 +2825,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) rc =0 ; }break ; - }; + }spin_lock_irqsave (&gp->lock, flags);gem_put_cell (gp);
drivers/net/tokenring/ibmtr.c +1 -1
@@ -177,7 +177,7 @@ static char __devinit *adapter_def(char type)case 0xD :return "16/4 Adapter/A (short) | 16/4 ISA-16 Adapter" ;case 0xC :return "Auto 16/4 Adapter" ;default :return "adapter (unknown type)" ; - }; + } };#define TRC_INIT 0x01/* Trace initialization & PROBEs */
drivers/net/tun.c +1 -1
@@ -655,7 +655,7 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun,case TUN_TAP_DEV : skb->protocol =eth_type_trans (skb, tun->dev);break ; - }; + }if (gso.gso_type !=VIRTIO_NET_HDR_GSO_NONE ) {pr_debug ("GSO!\n" );
drivers/net/wireless/b43/main.c +1 -1
@@ -4066,7 +4066,7 @@ static int b43_phy_versioning(struct b43_wldev *dev)#endif default : unsupported =1 ; - }; + }if (unsupported) { b43err(dev->wl, "FOUND UNSUPPORTED PHY " "(Analog %u, Type %u, Revision %u)\n",
drivers/net/wireless/b43legacy/main.c +1 -1
@@ -2974,7 +2974,7 @@ static int b43legacy_phy_versioning(struct b43legacy_wldev *dev)break ;default : unsupported =1 ; - }; + }if (unsupported) { b43legacyerr(dev->wl, "FOUND UNSUPPORTED PHY " "(Analog %u, Type %u, Revision %u)\n",
drivers/net/wireless/rt2x00/rt2800lib.c +1 -1
@@ -1326,7 +1326,7 @@ static void rt2800_config_ht_opmode(struct rt2x00_dev *rt2x00dev, gf20_rate = gf40_rate =0x0003 ; }break ; - }; + }/* check for STAs not supporting greenfield mode */ if (any_sta_nongf)
drivers/net/wireless/rt2x00/rt2800pci.c +1 -1
@@ -219,7 +219,7 @@ static void rt2800pci_start_queue(struct data_queue *queue)break ;default :break ; - }; + } }static void rt2800pci_kick_queue (struct data_queue *queue)
drivers/nfc/pn544.c +2 -2
@@ -667,7 +667,7 @@ static int pn544_suspend(struct device *dev)case PN544_ST_COLD :break ; - }; + }mutex_unlock (&info->mutex);return r;
@@ -698,7 +698,7 @@ static int pn544_resume(struct device *dev)case PN544_ST_FW_READY :break ; - }; + }mutex_unlock (&info->mutex);
drivers/pci/proc.c +1 -1
@@ -237,7 +237,7 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,default : ret = -EINVAL ;break ; - }; + }return ret; }
drivers/pci/syscall.c +1 -1
@@ -44,7 +44,7 @@ SYSCALL_DEFINE5(pciconfig_read, unsigned long, bus, unsigned long, dfn,default : err = -EINVAL ; goto error; - }; + } err = -EIO ;if (cfg_ret !=PCIBIOS_SUCCESSFUL )
drivers/pcmcia/db1xxx_ss.c +1 -1
@@ -422,7 +422,7 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)printk (KERN_INFO "db1xxx-ss: unknown board %d!\n" , bid); ret = -ENODEV ; goto out0; - }; + }/* * gather resources necessary and optional nice-to-haves to
drivers/pcmcia/m8xx_pcmcia.c +1 -1
@@ -801,7 +801,7 @@ static int m8xx_get_status(struct pcmcia_socket *sock, unsigned int *value)case 2 : *value |=SS_XVCARD ;break ;/* NC. GND - x.xV only */ - }; + } }pr_debug ("m8xx_pcmcia: GetStatus(%d) = %#2.2x\n" , lsock, *value);
drivers/rtc/rtc-rs5c372.c +1 -1
@@ -639,7 +639,7 @@ static int rs5c372_probe(struct i2c_client *client,case rtc_rv5c386: s ="rv5c386" ;break ;case rtc_rv5c387a: s ="rv5c387a" ;break ;default : s ="chip" ;break ; - }; s;}), + } s;}), rs5c372->time24 ?"24hr" :"am/pm" );
drivers/s390/net/ctcm_fsms.c +1 -1
@@ -1514,7 +1514,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg) goto done;default :break ; - }; + }fsm_newstate (fi, (CHANNEL_DIRECTION (ch->flags) ==CTCM_READ ) ?CTC_STATE_RXINIT :CTC_STATE_TXINIT );
drivers/s390/scsi/zfcp_fc.h +1 -1
@@ -229,7 +229,7 @@ void zfcp_fc_scsi_to_fcp(struct fcp_cmnd *fcp, struct scsi_cmnd *scsi,case MSG_SIMPLE_TAG : fcp->fc_pri_ta |=FCP_PTA_SIMPLE ;break ; - }; + } }else fcp->fc_pri_ta =FCP_PTA_SIMPLE ;
drivers/s390/scsi/zfcp_fsf.c +1 -1
@@ -204,7 +204,7 @@ static void zfcp_fsf_status_read_link_down(struct zfcp_fsf_req *req)break ;case FSF_STATUS_READ_SUB_FIRMWARE_UPDATE :zfcp_fsf_link_down_info_eval (req,NULL ); - }; + } }static void zfcp_fsf_status_read_handler (struct zfcp_fsf_req *req)
drivers/sbus/char/display7seg.c +1 -1
@@ -150,7 +150,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg) regs |=D7S_FLIP ;writeb (regs, p->regs);break ; - }; + }mutex_unlock (&d7s_mutex);return error;
drivers/sbus/char/envctrl.c +4 -4
@@ -353,7 +353,7 @@ static int envctrl_i2c_data_translate(unsigned char data, int translate_type,default :break ; - }; + }return len; }
@@ -644,7 +644,7 @@ envctrl_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)default :break ; - }; + }return ret; }
@@ -687,7 +687,7 @@ envctrl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)default :return -EINVAL ; - }; + }return 0 ; }
@@ -947,7 +947,7 @@ static void envctrl_init_i2c_child(struct device_node *dp,default :break ; - }; + } } }
drivers/sbus/char/openprom.c +3 -3
@@ -223,7 +223,7 @@ static int opromnext(void __user *argp, unsigned int cmd, struct device_node *dpcase OPROMSETCUR :default :break ; - }; + } }else {/* Sibling of node zero is the root node. */ if (cmd !=OPROMNEXT )
@@ -589,7 +589,7 @@ static int openprom_bsd_ioctl(struct file * file,default : err = -EINVAL ;break ; - }; + }mutex_unlock (&openprom_mutex);return err;
@@ -655,7 +655,7 @@ static long openprom_ioctl(struct file * file,default :return -EINVAL ; - }; + } } static long openprom_compat_ioctl(struct file *file, unsigned int cmd,
drivers/scsi/aha1542.c +3 -3
@@ -785,7 +785,7 @@ fail:default :printk (KERN_ERR "Unable to determine Adaptec DMA priority. Disabling board\n" );return -1 ; - }; + }switch (inquiry_result[1 ]) {case 0x40 : *irq_level =15 ;
@@ -808,7 +808,7 @@ fail:default :printk (KERN_ERR "Unable to determine Adaptec IRQ level. Disabling board\n" );return -1 ; - }; + } *scsi_id = inquiry_result[2 ] &7 ;return 0 ; }
@@ -1004,7 +1004,7 @@ static int __init aha1542_detect(struct scsi_host_template * tpnt)case 10 : atbt =0x03 ; break; - }; + } setup_dmaspeed[0 ] = atbt; }#endif
drivers/scsi/fnic/fnic_main.c +1 -1
@@ -301,7 +301,7 @@ static void fnic_notify_timer_start(struct fnic *fnic)default :/* Using intr for notification for INTx/MSI-X */ break ; - }; + } } static int fnic_dev_wait(struct vnic_dev *vdev,
drivers/scsi/ibmvscsi/ibmvfc.c +18 -18
@@ -176,7 +176,7 @@ static void ibmvfc_trc_start(struct ibmvfc_event *evt)break ;default :break ; - }; + } }/**
@@ -215,7 +215,7 @@ static void ibmvfc_trc_end(struct ibmvfc_event *evt)default : break; - }; + } }#else
@@ -459,7 +459,7 @@ static int ibmvfc_set_host_state(struct ibmvfc_host *vhost,default : vhost->state = state;break ; - }; + }return rc; }
@@ -495,7 +495,7 @@ static void ibmvfc_set_host_action(struct ibmvfc_host *vhost,break ;default :break ; - }; + }break ;case IBMVFC_HOST_ACTION_TGT_INIT :if (vhost->action ==IBMVFC_HOST_ACTION_ALLOC_TGTS )
@@ -510,7 +510,7 @@ static void ibmvfc_set_host_action(struct ibmvfc_host *vhost,default : vhost->action = action;break ; - }; + }break ;case IBMVFC_HOST_ACTION_LOGO :case IBMVFC_HOST_ACTION_QUERY_TGTS :
@@ -521,7 +521,7 @@ static void ibmvfc_set_host_action(struct ibmvfc_host *vhost,default : vhost->action = action;break ; - }; + } }/**
@@ -1593,7 +1593,7 @@ static inline int ibmvfc_host_chkready(struct ibmvfc_host *vhost)case IBMVFC_ACTIVE : result =0 ;break ; - }; + }return result; }
@@ -1653,7 +1653,7 @@ static int ibmvfc_queuecommand_lck(struct scsi_cmnd *cmnd,case MSG_ORDERED_TAG : vfc_cmd->iu.pri_task_attr =IBMVFC_ORDERED_TASK ;break ; - }; + } }if (likely (!(rc =ibmvfc_map_sg_data (cmnd, evt, vfc_cmd, vhost->dev))))
@@ -1857,7 +1857,7 @@ static int ibmvfc_bsg_request(struct fc_bsg_job *job)break ;default :return -ENOTSUPP ; - }; + }if (port_id ==-1 )return -EINVAL ;
@@ -2586,7 +2586,7 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq, vhost->delay_init =1 ;__ibmvfc_reset_host (vhost);break ; - }; + }break ;case IBMVFC_AE_LINK_UP :
@@ -2638,7 +2638,7 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,default :dev_err (vhost->dev,"Unknown async event received: %lld\n" , crq->event);break ; - }; + } }/**
@@ -3306,7 +3306,7 @@ static void ibmvfc_tgt_prli_done(struct ibmvfc_event *evt)ibmvfc_get_cmd_error (rsp->status, rsp->error), rsp->status, rsp->error, status);break ; - }; + }kref_put (&tgt->kref, ibmvfc_release_tgt);ibmvfc_free_event (evt);
@@ -3402,7 +3402,7 @@ static void ibmvfc_tgt_plogi_done(struct ibmvfc_event *evt)ibmvfc_get_fc_type (rsp->fc_type), rsp->fc_type, ibmvfc_get_ls_explain(rsp->fc_explain), rsp->fc_explain, status);break ; - }; + }kref_put (&tgt->kref, ibmvfc_release_tgt);ibmvfc_free_event (evt);
@@ -3473,7 +3473,7 @@ static void ibmvfc_tgt_implicit_logout_done(struct ibmvfc_event *evt)default :tgt_err (tgt,"Implicit Logout failed: rc=0x%02X\n" , status);break ; - }; + }if (vhost->action ==IBMVFC_HOST_ACTION_TGT_INIT )ibmvfc_init_tgt (tgt, ibmvfc_tgt_send_plogi);
@@ -3577,7 +3577,7 @@ static void ibmvfc_tgt_adisc_done(struct ibmvfc_event *evt)ibmvfc_get_fc_type (fc_reason), fc_reason, ibmvfc_get_ls_explain(fc_explain), fc_explain, status);break ; - }; + }kref_put (&tgt->kref, ibmvfc_release_tgt);ibmvfc_free_event (evt);
@@ -3789,7 +3789,7 @@ static void ibmvfc_tgt_query_target_done(struct ibmvfc_event *evt)ibmvfc_get_fc_type (rsp->fc_type), rsp->fc_type, ibmvfc_get_gs_explain(rsp->fc_explain), rsp->fc_explain, status);break ; - }; + }kref_put (&tgt->kref, ibmvfc_release_tgt);ibmvfc_free_event (evt);
@@ -4190,7 +4190,7 @@ static int __ibmvfc_work_to_do(struct ibmvfc_host *vhost)case IBMVFC_HOST_ACTION_REENABLE :default :break ; - }; + }return 1 ; }
@@ -4418,7 +4418,7 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost)break ;default :break ; - }; + }spin_unlock_irqrestore (vhost->host->host_lock, flags); }
drivers/scsi/ipr.c +2 -2
@@ -1011,7 +1011,7 @@ static void ipr_update_ata_class(struct ipr_resource_entry *res, unsigned int prdefault : res->ata_class =ATA_DEV_UNKNOWN ;break ; - }; + } }/**
@@ -5253,7 +5253,7 @@ static u8 ipr_get_task_attributes(struct scsi_cmnd *scsi_cmd)case MSG_ORDERED_TAG : rc =IPR_FLAGS_LO_ORDERED_TASK ;break ; - }; + } }return rc;
drivers/scsi/ipr.h +1 -1
@@ -1870,7 +1870,7 @@ static inline int ipr_sdt_is_fmt2(u32 sdt_word)case IPR_SDT_FMT2_BAR5_SEL :case IPR_SDT_FMT2_EXP_ROM_SEL :return 1 ; - }; + }return 0 ; }
drivers/scsi/pmcraid.c +1 -1
@@ -3187,7 +3187,7 @@ static u8 pmcraid_task_attributes(struct scsi_cmnd *scsi_cmd)case MSG_ORDERED_TAG : rc =TASK_TAG_ORDERED ;break ; - }; + } }return rc;
drivers/scsi/qlogicpti.c +1 -1
@@ -1140,7 +1140,7 @@ static struct scsi_cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti)case COMMAND_ERROR :case COMMAND_PARAM_ERROR :break ; - }; + }sbus_writew (0 , qpti->qregs +SBUS_SEMAPHORE ); }
drivers/scsi/sym53c8xx_2/sym_fw.c +1 -1
@@ -494,7 +494,7 @@ void sym_fw_bind_script(struct sym_hcb *np, u32 *start, int len)default : relocs =0 ;break ; - }; + }/* * Scriptify:) the opcode.
drivers/tty/nozomi.c +3 -3
@@ -970,7 +970,7 @@ static int receive_flow_control(struct nozomi *dc)dev_err (&dc->pdev->dev,"ERROR: flow control received for non-existing port\n" );return 0 ; - }; + }DBG1 ("0x%04X->0x%04X" , *((u16 *)&dc->port[port].ctrl_dl), *((u16 *)&ctrl_dl));
@@ -1036,7 +1036,7 @@ static enum ctrl_port_type port2ctrl(enum port_type port,dev_err (&dc->pdev->dev,"ERROR: send flow control " \"received for non-existing port\n" ); - }; + }return CTRL_ERROR ; }
@@ -1841,7 +1841,7 @@ static int ntty_ioctl(struct tty_struct *tty,default :DBG1 ("ERR: 0x%08X, %d" , cmd, cmd);break ; - }; + }return rval; }
drivers/tty/serial/bfin_5xx.c +2 -2
@@ -704,7 +704,7 @@ static int bfin_serial_startup(struct uart_port *port)default : uart_dma_ch_rx = uart_dma_ch_tx =0 ;break ; - }; + }if (uart_dma_ch_rx &&request_dma (uart_dma_ch_rx,"BFIN_UART_RX" ) <0 ) {
@@ -784,7 +784,7 @@ static void bfin_serial_shutdown(struct uart_port *port)break ;default : break; - }; + }#endif free_irq (uart->port.irq, uart);free_irq (uart->port.irq+1 , uart);
drivers/tty/serial/ip22zilog.c +1 -1
@@ -838,7 +838,7 @@ ip22zilog_convert_to_zs(struct uart_ip22zilog_port *up, unsigned int cflag, up->curregs[5 ] |= Tx8; up->parity_mask =0xff ;break ; - }; + } up->curregs[4 ] &= ~0x0c ;if (cflag &CSTOPB ) up->curregs[4 ] |=SB2 ;
drivers/tty/serial/pmac_zilog.c +1 -1
@@ -1126,7 +1126,7 @@ static void pmz_convert_to_zs(struct uart_pmac_port *uap, unsigned int cflag, uap->curregs[5 ] |= Tx8; uap->parity_mask =0xff ;break ; - }; + } uap->curregs[4 ] &= ~(SB_MASK );if (cflag &CSTOPB ) uap->curregs[4 ] |=SB2 ;
drivers/tty/serial/sunsab.c +1 -1
@@ -899,7 +899,7 @@ static int sunsab_console_setup(struct console *con, char *options)case B115200 : baud =115200 ;break ;case B230400 : baud =230400 ;break ;case B460800 : baud =460800 ;break ; - }; + }/* * Temporary fix.
drivers/tty/serial/sunsu.c +1 -1
@@ -522,7 +522,7 @@ static void receive_kbd_ms_chars(struct uart_sunsu_port *up, int is_break)serio_interrupt (&up->serio, ch,0 );#endif break ; - }; + } } }while (serial_in (up,UART_LSR ) &UART_LSR_DR ); }
drivers/tty/serial/sunzilog.c +3 -3
@@ -318,7 +318,7 @@ static void sunzilog_kbdms_receive_chars(struct uart_sunzilog_port *up,serio_interrupt (&up->serio, ch,0 );#endif break ; - }; + } } }
@@ -903,7 +903,7 @@ sunzilog_convert_to_zs(struct uart_sunzilog_port *up, unsigned int cflag, up->curregs[R5 ] |= Tx8; up->parity_mask =0xff ;break ; - }; + } up->curregs[R4 ] &= ~0x0c ;if (cflag &CSTOPB ) up->curregs[R4 ] |=SB2 ;
@@ -1245,7 +1245,7 @@ static int __init sunzilog_console_setup(struct console *con, char *options)default :case B9600 : baud =9600 ;break ;case B19200 : baud =19200 ;break ;case B38400 : baud =38400 ;break ; - }; + } brg =BPS_TO_BRG (baud,ZS_CLOCK /ZS_CLOCK_DIVISOR );
drivers/usb/core/hcd.c +1 -1
@@ -1637,7 +1637,7 @@ rescan: s ="-intr" ;break ;default : s ="-iso" ;break ; - }; + } s; }));usb_put_urb (urb);
drivers/usb/core/hub.c +1 -1
@@ -251,7 +251,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); }
drivers/usb/gadget/composite.c +1 -1
@@ -414,7 +414,7 @@ static int set_config(struct usb_composite_dev *cdev,case USB_SPEED_FULL : speed ="full" ;break ;case USB_SPEED_HIGH : speed ="high" ;break ;default : speed ="?" ;break ; - } ; speed; }), number, c ? c->label : "unconfigured"); + } speed; }), number, c ? c->label : "unconfigured");if (!c) goto done;
drivers/usb/gadget/dummy_hcd.c +3 -3
@@ -429,7 +429,7 @@ dummy_enable (struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)case USB_ENDPOINT_XFER_ISOC : val ="iso" ;break ;case USB_ENDPOINT_XFER_INT : val ="intr" ;break ;default : val ="ctrl" ;break ; - }; val; }), + } val; }), max);/* at this point real hardware should be NAKing transfers
@@ -1789,7 +1789,7 @@ show_urb (char *buf, size_t size, struct urb *urb)case USB_SPEED_FULL : s ="fs" ;break ;case USB_SPEED_HIGH : s ="hs" ;break ;default : s ="?" ;break ; - }; s; }), + } s; }), ep, ep ? (usb_pipein (urb->pipe) ? "in" : "out") : "", ({ char *s; \ switch (usb_pipetype (urb->pipe)) { \
@@ -1797,7 +1797,7 @@ show_urb (char *buf, size_t size, struct urb *urb)case PIPE_BULK : s ="-bulk" ;break ; \case PIPE_INTERRUPT : s ="-int" ;break ; \default : s ="-iso" ;break ; \ - }; s;}), + } s;}), urb->actual_length, urb->transfer_buffer_length); }
drivers/usb/gadget/goku_udc.c +1 -1
@@ -1179,7 +1179,7 @@ udc_proc_read(char *buffer, char **start, off_t off, int count, s ="invalid" ;break ;default : s ="?" ;break ; - }; s; }), + } s; }), (tmp & EPxSTATUS_TOGGLE) ?"data1" :"data0" , (tmp & EPxSTATUS_SUSPEND) ?" suspend" :"" , (tmp & EPxSTATUS_FIFO_DISABLE) ? " disable" : "",
drivers/usb/gadget/langwell_udc.c +1 -1
@@ -187,7 +187,7 @@ static char *type_string(const struct usb_endpoint_descriptor *desc)return "iso" ;case USB_ENDPOINT_XFER_INT :return "int" ; - }; + }return "control" ; }
drivers/usb/gadget/net2280.c +2 -2
@@ -135,7 +135,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
@@ -1632,7 +1632,7 @@ show_queues (struct device *_dev, struct device_attribute *attr, char *buf) val ="intr" ;break ;default : val ="iso" ;break ; - }; val; }), + } val; }),le16_to_cpu (d->wMaxPacketSize) &0x1fff , ep->dma ?"dma" :"pio" , ep->fifo_size );
drivers/usb/gadget/rndis.c +1 -1
@@ -1074,7 +1074,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",
drivers/usb/host/ehci-dbg.c +1 -1
@@ -409,7 +409,7 @@ struct debug_buffer {case 1 <<12 : tmp ='l' ;break ; \case 2 <<12 : tmp ='h' ;break ; \default : tmp ='?' ;break ; \ - }; tmp; }) + } tmp; })static inline char token_mark (struct ehci_hcd *ehci,__hc32 token) {
drivers/usb/host/isp116x.h +1 -1
@@ -555,7 +555,7 @@ static void urb_dbg(struct urb *urb, char *msg)case 0 : __c ='s' ;break ; \case 1 : __c ='o' ;break ; \default : __c ='i' ;break ; \ - }; __c;}) + } __c;})/* Dump PTD info. The code documents the format
drivers/usb/host/isp1362-hcd.c +1 -1
@@ -2127,7 +2127,7 @@ static int proc_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,
drivers/usb/host/ohci-dbg.c +1 -1
@@ -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
drivers/usb/host/sl811-hcd.c +2 -2
@@ -1419,7 +1419,7 @@ static int proc_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" : "");
@@ -1452,7 +1452,7 @@ static int proc_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) {
drivers/usb/host/whci/hcd.c +2 -2
@@ -133,7 +133,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; }
@@ -159,7 +159,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; }
drivers/usb/misc/usbtest.c +1 -1
@@ -2195,7 +2195,7 @@ usbtest_probe(struct usb_interface *intf, const struct usb_device_id *id)default : tmp ="unknown" ;break ; - }; tmp; }), + } tmp; }), info->ctrl_out ?" in/out" :"" , rtest, wtest, irtest, iwtest,
drivers/usb/musb/musb_core.c +2 -2
@@ -620,7 +620,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);
@@ -2114,7 +2114,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)case MUSB_HOST : s ="Host" ;break ;case MUSB_PERIPHERAL : s ="Peripheral" ;break ;default : s ="OTG" ;break ; - }; s; }), + } s; }), ctrl, (is_dma_capable () && musb->dma_controller) ? "DMA" : "PIO",
drivers/usb/musb/musb_gadget.c +1 -1
@@ -1101,7 +1101,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);
drivers/usb/musb/musb_host.c +2 -2
@@ -248,7 +248,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 */
@@ -315,7 +315,7 @@ __acquires(musb->lock)default : level =2 ;break ; - }; level; }), + } level; }),"complete %p %pF (%d), dev%d ep%d%s, %d/%d\n" , urb, urb->complete, status, usb_pipedevice(urb->pipe),
drivers/usb/otg/twl4030-usb.c +1 -1
@@ -315,7 +315,7 @@ static void twl4030_usb_set_mode(struct twl4030_usb *twl, int mode)dev_err (twl->dev,"unsupported T2 transceiver mode %d\n" , mode);break ; - }; + } }static void twl4030_i2c_access (struct twl4030_usb *twl,int on)
drivers/usb/wusbcore/cbaf.c +2 -2
@@ -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",
drivers/usb/wusbcore/devconnect.c +1 -1
@@ -985,7 +985,7 @@ int wusb_usb_ncb(struct notifier_block *nb, unsigned long val,default :WARN_ON (1 ); result =NOTIFY_BAD ; - }; + }return result; }
drivers/usb/wusbcore/wa-xfer.c +2 -2
@@ -424,7 +424,7 @@ static ssize_t __wa_xfer_setup_sizes(struct wa_xfer *xfer,/* never happens */ BUG (); result = -EINVAL ;/* shut gcc up */ - }; + } xfer->is_inbound = urb->pipe &USB_DIR_IN ?1 :0 ; xfer->is_dma = urb->transfer_flags &URB_NO_TRANSFER_DMA_MAP ?1 :0 ; xfer->seg_size =le16_to_cpu (rpipe->descr.wBlocks)
@@ -484,7 +484,7 @@ static void __wa_xfer_setup_hdr0(struct wa_xfer *xfer,printk (KERN_ERR "FIXME: ISOC not implemented\n" );default :BUG (); - }; + } }/*
drivers/vbus/pci-bridge.c +1 -1
@@ -648,7 +648,7 @@ eventq_wakeup(struct ioq_notifier *notifier)printk (KERN_WARNING "VBUS_PCI: Unexpected event %d\n" , event->eventid);break ; - }; + }memset (event,0 ,sizeof (*event));
drivers/video/cg14.c +2 -2
@@ -330,7 +330,7 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)default : ret = -ENOSYS ;break ; - }; + }if (!ret) {sbus_writeb (cur_mode, ®s->mcr); par->mode = mode;
@@ -343,7 +343,7 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)FBTYPE_MDICOLOR ,8 , info->fix.smem_len);break ; - }; + }return ret; }
drivers/video/cg6.c +1 -1
@@ -624,7 +624,7 @@ static void __devinit cg6_init_fix(struct fb_info *info, int linebytes)default : cg6_cpu_name ="i386" ;break ; - }; + }if (((conf >>CG6_FHC_REV_SHIFT ) &CG6_FHC_REV_MASK ) >=11 ) {if (info->fix.smem_len <=0x100000 ) cg6_card_name ="TGX" ;
drivers/video/leo.c +1 -1
@@ -469,7 +469,7 @@ static void leo_wid_put(struct fb_info *info, struct fb_wid_list *wl)default :continue ; - }; + }sbus_writel (0x5800 + j, &lx_krn->krn_type);sbus_writel (wi->wi_values[0 ], &lx_krn->krn_value); }
drivers/video/nvidia/nv_hw.c +1 -1
@@ -1300,7 +1300,7 @@ void NVLoadStateExt(struct nvidia_par *par, RIVA_HW_STATE * state)break ;default :break ; - }; + }NV_WR32 (par->PGRAPH,0x0b38 ,0x2ffff800 );NV_WR32 (par->PGRAPH,0x0b3c ,0x00006000 );
drivers/video/sbuslib.c +1 -1
@@ -187,7 +187,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, }default :return -EINVAL ; - }; + } }EXPORT_SYMBOL (sbusfb_ioctl_helper);
drivers/video/tcx.c +2 -2
@@ -232,7 +232,7 @@ tcx_blank(int blank, struct fb_info *info)case FB_BLANK_POWERDOWN :/* Poweroff */ break ; - }; + }sbus_writel (val, &thc->thc_misc);
@@ -434,7 +434,7 @@ static int __devinit tcx_probe(struct platform_device *op)default : j = i;break ; - }; + } par->mmap_map[i].poff = op->resource[j].start; }
drivers/watchdog/riowd.c +1 -1
@@ -139,7 +139,7 @@ static long riowd_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)default :return -EINVAL ; - }; + }return 0 ; }
fs/9p/vfs_inode.c +1 -1
@@ -1088,7 +1088,7 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode,P9_DPRINTK (P9_DEBUG_ERROR ,"Unknown special type %c %s\n" , type, stat->extension); - }; + } inode->i_rdev =MKDEV (major, minor);init_special_inode (inode, inode->i_mode, inode->i_rdev); }else
fs/btrfs/print-tree.c +1 -1
@@ -290,7 +290,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)btrfs_dev_extent_chunk_offset (l, dev_extent), (unsigned long long ) btrfs_dev_extent_length(l, dev_extent)); - }; + } } }
fs/gfs2/inode.c +1 -1
@@ -265,7 +265,7 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) ip->i_inode.i_rdev =MKDEV (be32_to_cpu (str->di_major),be32_to_cpu (str->di_minor));break ; - }; + } ip->i_inode.i_uid =be32_to_cpu (str->di_uid); ip->i_inode.i_gid =be32_to_cpu (str->di_gid);
fs/gfs2/ops_inode.c +1 -1
@@ -831,7 +831,7 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry, error = -EEXIST ;default : goto out_gunlock; - }; + }if (odip != ndip) {if (!ndip->i_inode.i_nlink) {
fs/gfs2/recovery.c +1 -1
@@ -478,7 +478,7 @@ void gfs2_recover_func(struct work_struct *work)default : goto fail; - }; + } error =gfs2_glock_nq_init (ip->i_gl,LM_ST_SHARED ,LM_FLAG_NOEXP |GL_NOCACHE , &ji_gh);
fs/lockd/clnt4xdr.c +2 -2
@@ -476,7 +476,7 @@ static void nlm4_xdr_enc_res(struct rpc_rqst *req,* struct nlm4_holder holder; * default: * void; -* }; +* } * * struct nlm4_testres { * netobj cookie;
@@ -508,7 +508,7 @@ static void nlm4_xdr_enc_testres(struct rpc_rqst *req,* struct nlm4_holder holder; * default: * void; -* }; +* } * * struct nlm4_testres { * netobj cookie;
fs/lockd/clntxdr.c +2 -2
@@ -469,7 +469,7 @@ static void nlm_xdr_enc_res(struct rpc_rqst *req,* struct nlm_holder holder; * default: * void; -* }; +* } * * struct nlm_testres { * netobj cookie;
@@ -506,7 +506,7 @@ static void nlm_xdr_enc_testres(struct rpc_rqst *req,* struct nlm_holder holder; * default: * void; -* }; +* } * * struct nlm_testres { * netobj cookie;
fs/nfs/nfs2xdr.c +5 -5
@@ -474,7 +474,7 @@ out_overflow:* fattr attributes; * default: * void; -* }; +* } */ static int decode_attrstat (struct xdr_stream *xdr,struct nfs_fattr *result) {
@@ -519,7 +519,7 @@ static void encode_diropargs(struct xdr_stream *xdr, const struct nfs_fh *fh,* } diropok; * default: * void; -* }; +* } */ static int decode_diropok (struct xdr_stream *xdr,struct nfs_diropok *result) {
@@ -820,7 +820,7 @@ static int nfs2_xdr_dec_diropres(struct rpc_rqst *req, struct xdr_stream *xdr,* path data; * default: * void; -* }; +* } */ static int nfs2_xdr_dec_readlinkres (struct rpc_rqst *req,struct xdr_stream *xdr,void *__unused)
@@ -849,7 +849,7 @@ out_default:* nfsdata data; * default: * void; -* }; +* } */ static int nfs2_xdr_dec_readres (struct rpc_rqst *req,struct xdr_stream *xdr,struct nfs_readres *result)
@@ -961,7 +961,7 @@ out_overflow:* } readdirok; * default: * void; -* }; +* } * * Read the directory contents into the page cache, but don't * touch them. The actual decoding is done by nfs2_decode_dirent()
fs/nfs/nfs3xdr.c +28 -28
224 lines not on this page · raw message
fs/nfs/nfs4proc.c +1 -1
@@ -4323,7 +4323,7 @@ static void nfs4_handle_setlk_error(struct nfs_server *server, struct nfs4_lock_ lsp->ls_seqid.flags &= ~NFS_SEQID_CONFIRMED ;case -NFS4ERR_EXPIRED :nfs4_schedule_lease_recovery (server->nfs_client); - }; + } }static int _nfs4_do_setlk (struct nfs4_state *state,int cmd,struct file_lock *fl,int recovery_type)
fs/nfs/nfs4state.c +1 -1
@@ -933,7 +933,7 @@ static void nfs_increment_seqid(int status, struct nfs_seqid *seqid)case -NFS4ERR_NOFILEHANDLE :/* Non-seqid mutating errors */ return ; - }; + }/* * Note: no locking needed as we are guaranteed to be first * on the sequence list
fs/nfs/super.c +2 -2
@@ -1413,7 +1413,7 @@ static int nfs_parse_mount_options(char *raw,dfprintk (MOUNT ,"NFS: invalid " "lookupcache argument\n" );return 0 ; - }; + }break ;case Opt_fscache_uniq:if (nfs_get_option_str (args, &mnt->fscache_uniq))
@@ -1446,7 +1446,7 @@ static int nfs_parse_mount_options(char *raw,dfprintk (MOUNT ,"NFS: invalid " "local_lock argument\n" );return 0 ; - }; + }break ;/*
fs/nfsd/nfs4callback.c +1 -1
@@ -412,7 +412,7 @@ static void encode_cb_sequence4args(struct xdr_stream *xdr,* CB_SEQUENCE4resok csr_resok4; * default: * void; -* }; +* } * * Our current back channel implmentation supports a single backchannel * with a single slot.
fs/nfsd/nfs4state.c +1 -1
@@ -1608,7 +1608,7 @@ static __be32 nfsd4_map_bcts_dir(u32 *dir)case NFS4_CDFC4_BACK_OR_BOTH : *dir =NFS4_CDFC4_BOTH ;return nfs_ok; - }; + }return nfserr_inval; }
fs/notify/fanotify/fanotify.c +1 -1
@@ -25,7 +25,7 @@ static bool should_merge(struct fsnotify_event *old, struct fsnotify_event *new)return true;default :BUG (); - }; + } }return false; }
fs/notify/inotify/inotify_fsnotify.c +1 -1
@@ -63,7 +63,7 @@ static bool event_compare(struct fsnotify_event *old, struct fsnotify_event *newelse if (old->mask &FS_IN_IGNORED )return false;return true; - }; + } }return false; }
fs/ocfs2/cluster/quorum.c +1 -1
@@ -86,7 +86,7 @@ static void o2quo_fence_self(void) "system by restarting ***\n");emergency_restart ();break ; - }; + } }/* Indicate that a timeout occured on a hearbeat region write. The
fs/ocfs2/dlmglue.c +1 -1
@@ -554,7 +554,7 @@ void ocfs2_inode_lock_res_init(struct ocfs2_lock_res *res,mlog_bug_on_msg (1 ,"type: %d\n" , type); ops =NULL ;/* thanks, gcc */ break ; - }; + }ocfs2_build_lock_name (type,OCFS2_I (inode)->ip_blkno, generation, res->l_name);
fs/ubifs/sb.c +1 -1
@@ -583,7 +583,7 @@ int ubifs_read_superblock(struct ubifs_info *c) c->key_hash = key_test_hash; c->key_hash_type =UBIFS_KEY_HASH_TEST ;break ; - }; + } c->key_fmt = sup->key_fmt;
include/linux/hp_sdc.h +1 -1
@@ -168,7 +168,7 @@ switch (val) { \case 0x2 : str ="1820-4379" ;break ; \case 0x3 : str ="1820-4784" ;break ; \default : str ="unknown" ; \ -}; +}#define HP_SDC_XTD_BEEPER 0x08/* TI SN76494 beeper available */ #define HP_SDC_XTD_BBRTC 0x20/* OKI MSM-58321 BBRTC present */
include/net/sctp/sctp.h +2 -2
@@ -601,7 +601,7 @@ static inline int ipver2af(__u8 ipver)return AF_INET6 ;default :return 0 ; - }; + } }/* Convert from an address parameter type to an address family. */
@@ -614,7 +614,7 @@ static inline int param_type2af(__be16 type)return AF_INET6 ;default :return 0 ; - }; + } }/* Perform some sanity checks. */
kernel/audit_watch.c +1 -1
@@ -515,7 +515,7 @@ static int audit_watch_handle_event(struct fsnotify_group *group,BUG (); inode =NULL ;break ; - }; + }if (mask & (FS_CREATE |FS_MOVED_TO ) && inode)audit_update_watch (parent, dname, inode->i_sb->s_dev, inode->i_ino,0 );
kernel/res_counter.c +1 -1
@@ -103,7 +103,7 @@ res_counter_member(struct res_counter *counter, int member)return &counter->failcnt;case RES_SOFT_LIMIT :return &counter->soft_limit; - }; + }BUG ();return NULL ;
kernel/smp.c +1 -1
@@ -65,7 +65,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)free_cpumask_var (cfd->cpumask);break ;#endif - }; + }return NOTIFY_OK ; }
net/batman-adv/hard-interface.c +1 -1
@@ -554,7 +554,7 @@ static int hard_if_event(struct notifier_block *this,break ;default :break ; - }; + } hardif_put:hardif_free_ref (hard_iface);
security/selinux/hooks.c +1 -1
@@ -990,7 +990,7 @@ static void selinux_write_opts(struct seq_file *m,continue ;default :BUG (); - }; + }/* we need a comma before each option */ seq_putc (m,',' );seq_puts (m, prefix);
sound/drivers/vx/vx_pcm.c +1 -1
@@ -184,7 +184,7 @@ static int vx_set_format(struct vx_core *chip, struct vx_pipe *pipe,default :snd_BUG ();return -EINVAL ; - }; + }return vx_set_stream_format (chip, pipe, header); }
sound/oss/sb_ess.c +5 -5
@@ -1104,7 +1104,7 @@ int ess_init(sb_devc * devc, struct address_info *hw_config)default :printk (KERN_ERR "Invalid esstype=%d specified\n" , devc->sbmo.esstype);return 0 ; - }; + }if (submodel !=-1 ) { devc->submodel = submodel;sprintf (modelname,"ES%d" , devc->sbmo.esstype);
@@ -1150,7 +1150,7 @@ FKS_test (devc);if ((type &0x00ff ) != ((type >>8 ) &0x00ff )) {printk ("ess_init: Unrecognized %04x\n" , type); } - }; + } }#if 0 /*
@@ -1293,7 +1293,7 @@ printk(KERN_INFO "ess_set_dma_hw: dma8=%d,dma16=%d,dup=%d\n"default :printk (KERN_ERR "ESS1887: Invalid DMA16 %d\n" , dma);return 0 ; - }; + }ess_chgmixer (devc,0x78 ,0x20 , dma16_bits);ess_chgmixer (devc,0x7d ,0x07 , dma_bits); }
@@ -1544,7 +1544,7 @@ static int ess_has_rec_mixer (int submodel)return 1 ;default :return 0 ; - }; + } };#ifdef FKS_LOGGING
@@ -1761,7 +1761,7 @@ int ess_mixer_reset (sb_devc * devc)ess_chgmixer (devc,0x7a ,0x18 ,0x08 );ess_chgmixer (devc,0x1c ,0x07 ,0x07 );break ; - }; + }/* * Call set_recmask for proper initialization */
sound/pci/asihpi/asihpi.c +1 -1
@@ -2614,7 +2614,7 @@ static int __devinit snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi) hpi_ctl.dst_node_type, hpi_ctl.dst_node_index);continue ; - }; + }if (err <0 )return err; }
sound/pci/emu10k1/emupcm.c +1 -1
@@ -1305,7 +1305,7 @@ static int snd_emu10k1_capture_efx_open(struct snd_pcm_substream *substream) runtime->hw.channels_min = runtime->hw.channels_max =16 ; break; - }; + }#endif #if 0 /* For 96kHz */
sound/pci/intel8x0.c +1 -1
@@ -2174,7 +2174,7 @@ static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,case DEVICE_INTEL_ICH4 : chip->spdif_idx =ICHD_SPBAR ;break ; - }; + } } chip->in_ac97_init =1 ;
sound/sparc/amd7930.c +2 -2
@@ -813,7 +813,7 @@ static int snd_amd7930_get_volume(struct snd_kcontrol *kctl, struct snd_ctl_elemdefault : swval = &amd->pgain;break ; - }; + } ucontrol->value.integer.value[0 ] = *swval;
@@ -838,7 +838,7 @@ static int snd_amd7930_put_volume(struct snd_kcontrol *kctl, struct snd_ctl_elemdefault : swval = &amd->pgain;break ; - }; + }spin_lock_irqsave (&amd->lock, flags);
sound/sparc/dbri.c +1 -1
@@ -591,7 +591,7 @@ static __u32 reverse_bytes(__u32 b, int len)break ;default :printk (KERN_ERR "DBRI reverse_bytes: unsupported length\n" ); - }; + }return b; }
Signature · 1 line
1.7.4.2.g597a6.dirty