ath10k: remove unneded semicolon from ath10k_core_fetch_firmware_api_n()
Subsystems (140)
PATCH 1/1 ath10k: remove unneded semicolon from ath10k_core_fetch_firmware_api_n()
From: Fengguang Wu <[email protected]>
drivers/net/wireless/ath/ath10k/core.c:507:2-3: Unneeded semicolon
Removes unneeded semicolon.
Generated by: coccinelle/misc/semicolon.cocci
--- drivers/net/wireless/ath/ath10k/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/core.c +1 -1
@@ -507,7 +507,7 @@ static int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name) len -= ie_len; data += ie_len; - }; + }if (!ar->firmware_data || !ar->firmware_len) { ath10k_warn("No ATH10K_FW_IE_FW_IMAGE found from %s, skipping\n",
Re: remove unneeded semicolons
Quoted 7 lines · Kalle Valo
From: Fengguang Wu <[email protected]>
drivers/net/wireless/ath/ath10k/core.c:507:2-3: Unneeded semicolon
Removes unneeded semicolon.
Generated by:
coccinelle/misc/semicolon.cocci
There are _many_ of these.
With a perl script, basically:
$count += $text =~ s@\b((?:switch|for|while|if)\s*${match_balanced_parentheses}\s*)${match_balanced_braces}\s*;@"$1$3"@egx;
I get:
(there's at least one false positive in
drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c
where there's a quoted semicolon like "\n;")
arch/alpha/kernel/osf_sys.c | 2 +- arch/alpha/kernel/sys_eiger.c | 2 +- arch/arm/kernel/psci.c | 2 +- arch/arm/mach-at91/gpio.c | 2 +- arch/arm/mach-imx/clk-imx6q.c | 2 +- arch/arm64/kernel/psci.c | 2 +- arch/cris/arch-v32/drivers/cryptocop.c | 4 +- arch/ia64/kvm/vcpu.c | 2 +- arch/ia64/kvm/vtlb.c | 4 +- arch/m68k/sun3/prom/console.c | 10 ++-- arch/mips/netlogic/xlr/fmn.c | 2 +- arch/mips/oprofile/common.c | 2 +- arch/powerpc/boot/cuboot-c2k.c | 2 +- arch/powerpc/kernel/eeh.c | 2 +- arch/powerpc/kernel/prom_init.c | 2 +- arch/powerpc/kvm/booke.c | 2 +- arch/powerpc/platforms/ps3/system-bus.c | 4 +- arch/powerpc/sysdev/tsi108_dev.c | 2 +- arch/s390/mm/extmem.c | 2 +- arch/x86/kernel/cpu/perf_event_intel_uncore.c | 6 +-- 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/amiflop.c | 4 +- drivers/block/drbd/drbd_req.c | 2 +- drivers/block/sunvdc.c | 2 +- drivers/bluetooth/bfusb.c | 2 +- drivers/bluetooth/bt3c_cs.c | 2 +- drivers/bluetooth/dtl1_cs.c | 2 +- drivers/char/hw_random/omap-rng.c | 2 +- drivers/clk/clk.c | 2 +- drivers/clk/mvebu/common.c | 2 +- drivers/clk/samsung/clk-pll.c | 2 +- drivers/clocksource/metag_generic.c | 2 +- drivers/cpufreq/longhaul.c | 2 +- drivers/cpufreq/pcc-cpufreq.c | 2 +- drivers/cpufreq/speedstep-lib.c | 2 +- drivers/gpu/drm/ast/ast_post.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 +- drivers/gpu/drm/i915/dvo_ch7xxx.c | 2 +- drivers/gpu/drm/i915/dvo_ivch.c | 2 +- drivers/gpu/drm/i915/dvo_ns2501.c | 2 +- drivers/gpu/drm/i915/dvo_sil164.c | 2 +- drivers/gpu/drm/i915/dvo_tfp410.c | 2 +- drivers/gpu/drm/nouveau/core/engine/graph/nv50.c | 2 +- drivers/gpu/drm/radeon/radeon_bios.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/infiniband/hw/ocrdma/ocrdma_hw.c | 6 +-- drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +- drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 6 +-- drivers/input/touchscreen/mms114.c | 4 +- drivers/iommu/fsl_pamu_domain.c | 4 +- drivers/isdn/hisax/netjet.c | 2 +- drivers/isdn/hisax/q931.c | 2 +- drivers/isdn/i4l/isdn_net.c | 2 +- drivers/isdn/pcbit/drv.c | 4 +- drivers/media/common/b2c2/flexcop-sram.c | 6 +-- drivers/media/dvb-frontends/cx24110.c | 2 +- drivers/media/dvb-frontends/cx24123.c | 2 +- drivers/media/dvb-frontends/tda8083.c | 4 +- drivers/media/i2c/soc_camera/ov9640.c | 2 +- drivers/media/platform/exynos4-is/fimc-isp.c | 2 +- drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c | 2 +- drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 2 +- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 2 +- drivers/media/platform/s5p-tv/mixer_grp_layer.c | 2 +- drivers/media/platform/s5p-tv/mixer_vp_layer.c | 2 +- drivers/media/radio/si470x/radio-si470x-common.c | 2 +- drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c | 2 +- drivers/media/v4l2-core/v4l2-ctrls.c | 2 +- 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/stmpe.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/vub300.c | 6 +-- drivers/mmc/host/wbsd.c | 2 +- drivers/mtd/nand/mpc5121_nfc.c | 2 +- drivers/mtd/ubi/cdev.c | 2 +- drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 +- drivers/net/ethernet/mellanox/mlx4/eq.c | 2 +- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 2 +- drivers/net/usb/sr9700.c | 2 +- drivers/net/wireless/ath/ath10k/htt_rx.c | 2 +- drivers/net/wireless/ath/ath6kl/init.c | 2 +- drivers/net/wireless/iwlwifi/mvm/d3.c | 2 +- drivers/net/wireless/iwlwifi/mvm/led.c | 2 +- drivers/net/wireless/iwlwifi/mvm/scan.c | 2 +- drivers/pci/proc.c | 2 +- drivers/pci/syscall.c | 2 +- drivers/pcmcia/db1xxx_ss.c | 2 +- drivers/pcmcia/m8xx_pcmcia.c | 2 +- drivers/pinctrl/pinctrl-exynos5440.c | 2 +- drivers/pinctrl/pinctrl-samsung.c | 2 +- drivers/pinctrl/pinctrl-sunxi.c | 2 +- drivers/pinctrl/pinctrl-tz1090-pdc.c | 4 +- drivers/pinctrl/pinctrl-tz1090.c | 4 +- drivers/power/ab8500_charger.c | 6 +-- drivers/power/ab8500_fg.c | 14 +++--- drivers/power/abx500_chargalg.c | 2 +- drivers/power/reset/vexpress-poweroff.c | 2 +- drivers/regulator/da9063-regulator.c | 2 +- drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- drivers/rtc/rtc-rs5c372.c | 2 +- drivers/s390/char/monreader.c | 2 +- drivers/s390/scsi/zfcp_fsf.c | 2 +- drivers/sbus/char/openprom.c | 2 +- drivers/scsi/aha1542.c | 24 +++++----- drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c | 2 +- drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- drivers/scsi/bfa/bfa_fcs_rport.c | 2 +- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 6 +-- drivers/scsi/fcoe/fcoe.c | 6 +-- drivers/scsi/fcoe/fcoe_sysfs.c | 4 +- drivers/scsi/fnic/fnic_main.c | 2 +- drivers/scsi/ibmvscsi/ibmvfc.c | 38 +++++++-------- drivers/scsi/ibmvscsi/ibmvstgt.c | 2 +- drivers/scsi/ipr.c | 4 +- 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/staging/iio/adc/ad7291.c | 2 +- drivers/staging/iio/cdc/ad7150.c | 2 +- drivers/staging/imx-drm/imx-tve.c | 2 +- drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 2 +- drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +- drivers/staging/rtl8188eu/core/rtw_recv.c | 2 +- drivers/staging/rtl8188eu/hal/hal_com.c | 4 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 +- drivers/target/sbp/sbp_target.c | 2 +- drivers/tty/nozomi.c | 6 +-- drivers/tty/serial/bfin_uart.c | 4 +- drivers/tty/serial/ip22zilog.c | 2 +- drivers/tty/serial/max310x.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/dwc3/ep0.c | 6 +-- drivers/usb/gadget/composite.c | 2 +- drivers/usb/gadget/dummy_hcd.c | 6 +-- drivers/usb/gadget/goku_udc.c | 2 +- drivers/usb/gadget/net2280.c | 4 +- drivers/usb/gadget/rndis.c | 2 +- drivers/usb/gadget/tcm_usb_gadget.c | 4 +- drivers/usb/host/ehci-dbg.c | 2 +- drivers/usb/host/fotg210-hcd.c | 2 +- drivers/usb/host/fusbh200-hcd.c | 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-pci.c | 2 +- drivers/usb/host/whci/hcd.c | 4 +- drivers/usb/musb/musb_core.c | 2 +- drivers/usb/musb/musb_dsps.c | 2 +- drivers/usb/musb/musb_gadget.c | 2 +- drivers/usb/musb/musb_host.c | 2 +- drivers/usb/phy/phy-twl4030-usb.c | 2 +- drivers/usb/phy/phy-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/video/cfbimgblt.c | 2 +- drivers/video/cg14.c | 4 +- drivers/video/cg6.c | 2 +- drivers/video/exynos/exynos_mipi_dsi_common.c | 2 +- drivers/video/fsl-diu-fb.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/omap2/displays-new/panel-dsi-cm.c | 2 +- drivers/video/omap2/dss/dispc.c | 2 +- drivers/video/omap2/dss/dsi.c | 2 +- drivers/video/sbuslib.c | 2 +- drivers/video/sysimgblt.c | 2 +- drivers/video/tcx.c | 4 +- drivers/video/vt8500lcdfb.c | 2 +- drivers/watchdog/riowd.c | 2 +- fs/9p/vfs_inode.c | 2 +- fs/befs/btree.c | 2 +- fs/btrfs/print-tree.c | 2 +- fs/dlm/rcom.c | 2 +- fs/gfs2/glops.c | 2 +- fs/gfs2/inode.c | 2 +- fs/gfs2/recovery.c | 2 +- fs/hpfs/buffer.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 | 6 +-- fs/nfsd/nfs4callback.c | 2 +- fs/nfsd/nfs4state.c | 2 +- fs/nfsd/nfs4xdr.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/reiserfs/bitmap.c | 2 +- fs/ubifs/sb.c | 2 +- kernel/audit_watch.c | 2 +- kernel/auditfilter.c | 4 +- kernel/res_counter.c | 2 +- kernel/smp.c | 2 +- lib/decompress_bunzip2.c | 2 +- mm/memcontrol.c | 2 +- mm/oom_kill.c | 2 +- net/sunrpc/auth_gss/auth_gss.c | 2 +- scripts/conmakehash.c | 4 +- scripts/dtc/fdtdump.c | 2 +- security/apparmor/path.c | 2 +- security/selinux/hooks.c | 2 +- sound/oss/sb_ess.c | 2 +- sound/pci/au88x0/au88x0_pcm.c | 2 +- sound/soc/atmel/atmel_ssc_dai.c | 2 +- sound/soc/codecs/ak4641.c | 2 +- sound/soc/codecs/mc13783.c | 2 +- sound/soc/codecs/tas5086.c | 2 +- sound/soc/codecs/twl6040.c | 4 +- sound/soc/fsl/fsl_spdif.c | 4 +- sound/soc/tegra/tegra20_i2s.c | 6 +-- sound/soc/tegra/tegra20_spdif.c | 6 +-- sound/soc/tegra/tegra30_ahub.c | 4 +- sound/soc/tegra/tegra30_i2s.c | 4 +- tools/lib/traceevent/kbuffer-parse.c | 2 +- tools/perf/builtin-diff.c | 2 +- tools/perf/builtin-lock.c | 2 +- tools/perf/tests/code-reading.c | 2 +- tools/perf/util/trace-event-read.c | 2 +- tools/power/cpupower/utils/cpupower-info.c | 2 +- tools/power/cpupower/utils/cpupower-set.c | 2 +- .../cpupower/utils/idle_monitor/amd_fam14h_idle.c | 2 +- .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 6 +-- .../cpupower/utils/idle_monitor/hsw_ext_idle.c | 2 +- tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 2 +- tools/power/cpupower/utils/idle_monitor/snb_idle.c | 2 +- tools/testing/selftests/ipc/msgque.c | 6 +-- tools/virtio/virtio-trace/trace-agent-ctl.c | 2 +- 263 files changed, 411 insertions(+), 413 deletions(-)
arch/alpha/kernel/osf_sys.c +1 -1
@@ -683,7 +683,7 @@ SYSCALL_DEFINE2(osf_proplist_syscall, enum pl_code, code,default : error = -EOPNOTSUPP ;break ; - }; + }return error; }
arch/alpha/kernel/sys_eiger.c +1 -1
@@ -176,7 +176,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/kernel/psci.c +1 -1
@@ -54,7 +54,7 @@ static int psci_to_linux_errno(int errno)return -EINVAL ;case PSCI_RET_EPERM :return -EPERM ; - }; + }return -EINVAL ; }
arch/arm/mach-at91/gpio.c +1 -1
@@ -659,7 +659,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\t" ,'A' + bank); - }; + }seq_printf (s,"\n\n" );/* print pin status */
arch/arm/mach-imx/clk-imx6q.c +1 -1
@@ -305,7 +305,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) post_div_table[2 ].div =1 ; video_div_table[1 ].div =1 ; video_div_table[2 ].div =1 ; - }; + }/* type name parent_name base div_mask */ clk[pll1_sys] =imx_clk_pllv3 (IMX_PLLV3_SYS ,"pll1_sys" ,"osc" , base,0x7f );
arch/arm64/kernel/psci.c +1 -1
@@ -52,7 +52,7 @@ static int psci_to_linux_errno(int errno)return -EINVAL ;case PSCI_RET_EPERM :return -EPERM ; - }; + }return -EINVAL ; }
arch/cris/arch-v32/drivers/cryptocop.c +2 -2
@@ -1773,7 +1773,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. */
@@ -3012,7 +3012,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/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/m68k/sun3/prom/console.c +5 -5
@@ -79,7 +79,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);
@@ -103,7 +103,7 @@ prom_query_input_device() return PROMDEV_ITTYB; }return PROMDEV_I_UNK ; - }; + } }#endif
@@ -125,7 +125,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 :
@@ -160,10 +160,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/mips/netlogic/xlr/fmn.c +1 -1
@@ -103,7 +103,7 @@ static irqreturn_t fmn_message_handler(int irq, void *data) mflags =nlm_cop2_enable_irqsave (); } } - }; + }/* Enable message ring intr, to any thread in core */ nlm_fmn_setup_intr (irq, (1 << nlm_threads_per_core) -1 );nlm_cop2_disable_irqrestore (mflags);
arch/mips/oprofile/common.c +1 -1
@@ -99,7 +99,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/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/powerpc/kernel/eeh.c +1 -1
@@ -561,7 +561,7 @@ int pcibios_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state statbreak ;default :return -EINVAL ; - }; + }return 0 ; }
arch/powerpc/kernel/prom_init.c +1 -1
@@ -2701,7 +2701,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.c +1 -1
@@ -621,7 +621,7 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu)kvmppc_set_exit_type (vcpu,EMULATED_MTMSRWE_EXITS ); r =1 ; - }; + }return r; }
arch/powerpc/platforms/ps3/system-bus.c +2 -2
@@ -614,7 +614,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);
@@ -772,7 +772,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/sysdev/tsi108_dev.c +1 -1
@@ -51,7 +51,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/s390/mm/extmem.c +1 -1
@@ -158,7 +158,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/cpu/perf_event_intel_uncore.c +3 -3
@@ -2365,7 +2365,7 @@ static void nhmex_rbox_alter_er(struct intel_uncore_box *box, struct perf_event/* shift the 0~7 bits to the 8~15 bits */ reg1->config <<=8 ;break ; - }; + } }/*
@@ -2507,7 +2507,7 @@ static int nhmex_rbox_hw_config(struct intel_uncore_box *box, struct perf_event hwc->config |= event->attr.config & (~0ULL <<32 ); reg2->config = event->attr.config2;break ; - }; + }return 0 ; }
@@ -2545,7 +2545,7 @@ static void nhmex_rbox_msr_enable_event(struct intel_uncore_box *box, struct perwrmsrl (NHMEX_R_MSR_PORTN_XBR_SET2_MATCH (port), reg1->config);wrmsrl (NHMEX_R_MSR_PORTN_XBR_SET2_MASK (port), reg2->config);break ; - }; + }wrmsrl (hwc->config_base,NHMEX_PMON_CTL_EN_BIT0 | (hwc->config &NHMEX_R_PMON_CTL_EV_SEL_MASK ));
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/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/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/ata/pata_bf54x.c +1 -1
@@ -1678,7 +1678,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
@@ -2579,7 +2579,7 @@ static int hrz_getsockopt (struct atm_vcc * atm_vcc, int level, int optname,// break; default :return -ENOPROTOOPT ; - }; + }break ; }return -EINVAL ;
@@ -2598,7 +2598,7 @@ static int hrz_setsockopt (struct atm_vcc * atm_vcc, int level, int optname,// break; default :return -ENOPROTOOPT ; - }; + }break ; }return -EINVAL ;
drivers/block/amiflop.c +1 -3
@@ -911,9 +911,7 @@ struct dos_header { ; c = *data++ + crchi; ; crchi = (@ c) >> 8 + crclo; ; crclo = @ c; -; } -; -; Remember, + is done with EOR, the @ operator is in two tables (high +; } Remember, + is done with EOR, the @ operator is in two tables (high ; and low byte separately), which is calculated as ; ; $1021 * (c & $F0)
drivers/block/drbd/drbd_req.c +1 -1
@@ -759,7 +759,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,start_new_tl_epoch (mdev->tconn);mod_rq_state (req, m,0 ,RQ_NET_OK |RQ_NET_DONE );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/bt3c_cs.c +1 -1
@@ -439,7 +439,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/dtl1_cs.c +1 -1
@@ -412,7 +412,7 @@ static int dtl1_hci_send_frame(struct sk_buff *skb)break ;default :return -EILSEQ ; - }; + } nsh.zero =0 ; nsh.len = skb->len;
drivers/char/hw_random/omap-rng.c +1 -1
@@ -372,7 +372,7 @@ static int omap_rng_probe(struct platform_device *pdev)if (!priv) {dev_err (&pdev->dev,"could not allocate memory\n" );return -ENOMEM ; - }; + } omap_rng_ops.priv = (unsigned long )priv;platform_set_drvdata (pdev, priv);
drivers/clk/clk.c +1 -1
@@ -1520,7 +1520,7 @@ static struct clk *__clk_init_parent(struct clk *clk)"%s: multi-parent clocks must implement .get_parent\n" , __func__); goto out; - }; + }/* * Do our best to cache parent clocks in clk->parents. This prevents
drivers/clk/mvebu/common.c +1 -1
@@ -77,7 +77,7 @@ void __init mvebu_coreclk_setup(struct device_node *np, clk_data.clks[2 +n] =clk_register_fixed_factor (NULL , rclk_name, cpuclk_name,0 , mult, div);WARN_ON (IS_ERR (clk_data.clks[2 +n])); - }; + }/* SAR register isn't needed anymore */ iounmap (base);
drivers/clk/samsung/clk-pll.c +1 -1
@@ -375,7 +375,7 @@ static int samsung_pll45xx_set_rate(struct clk_hw *hw, unsigned long drate,break ;default :break ; - }; + }/* Set new configuration. */ __raw_writel (con1, pll->con_reg +0x4 );
drivers/clocksource/metag_generic.c +1 -1
@@ -72,7 +72,7 @@ static void metag_timer_set_mode(enum clock_event_mode mode,case CLOCK_EVT_MODE_UNUSED :WARN_ON (1 );break ; - }; + } }static cycle_t metag_clocksource_read (struct clocksource *cs)
drivers/cpufreq/longhaul.c +1 -1
@@ -874,7 +874,7 @@ static int longhaul_cpu_init(struct cpufreq_policy *policy)case TYPE_POWERSAVER :printk (KERN_CONT "Powersaver supported.\n" );break ; - }; + }/* Doesn't hurt */ longhaul_setup_southbridge ();
drivers/cpufreq/pcc-cpufreq.c +1 -1
@@ -273,7 +273,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/cpufreq/speedstep-lib.c +1 -1
@@ -239,7 +239,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);
drivers/gpu/drm/ast/ast_post.c +2 -2
@@ -1196,7 +1196,7 @@ static void get_ddr3_info(struct ast_private *ast, struct ast2300_dram_param *pacase AST_DRAM_4Gx16: param->dram_config =0x133 ;break ; - };/* switch size */ + }/* switch size */ switch (param->vram_size) {default :
@@ -1567,7 +1567,7 @@ static void get_ddr2_info(struct ast_private *ast, struct ast2300_dram_param *pacase AST_DRAM_4Gx16: param->dram_config =0x123 ;break ; - };/* switch size */ + }/* switch size */ switch (param->vram_size) {default :
drivers/gpu/drm/exynos/exynos_drm_g2d.c +1 -1
@@ -605,7 +605,7 @@ static enum g2d_reg_type g2d_get_reg_type(int reg_offset) reg_type =REG_TYPE_NONE ;DRM_ERROR ("Unknown register offset![%d]\n" , reg_offset);break ; - }; + }return reg_type; }
drivers/gpu/drm/i915/dvo_ch7xxx.c +1 -1
@@ -160,7 +160,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_ns2501.c +1 -1
@@ -164,7 +164,7 @@ static bool ns2501_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 (!ns->quiet) {DRM_DEBUG_KMS
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/gpu/drm/nouveau/core/engine/graph/nv50.c +1 -1
@@ -850,7 +850,7 @@ nv50_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine,nv_engine (priv)->sclass = nvaf_graph_sclass;break ; - }; + }/* unfortunate hw bug workaround... */ if (nv_device(priv)->chipset != 0x50 &&
drivers/gpu/drm/radeon/radeon_bios.c +1 -1
@@ -612,7 +612,7 @@ static bool radeon_acpi_vfct_bios(struct radeon_device *rdev) vhdr->DeviceID != rdev->pdev->device) {DRM_INFO ("ACPI VFCT table is not for this card\n" ); goto out_unmap; - }; + }if (vfct->VBIOSImageOffset +sizeof (VFCT_IMAGE_HEADER ) + vhdr->ImageLength > tbl_size) {DRM_ERROR ("ACPI VFCT image truncated\n" );
drivers/hwmon/adm1026.c +3 -3
@@ -616,7 +616,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 )) {
@@ -700,7 +700,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);
@@ -1791,7 +1791,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; }
@@ -1030,7 +1030,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. */
@@ -1044,7 +1044,7 @@ static struct asc7621_data *asc7621_update_device(struct device *dev) } } data->last_low_reading = jiffies; - };/* last_reading */ + }/* last_reading */ data->valid =1 ;
@@ -1084,11 +1084,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/ide/ide-taskfile.c +1 -1
@@ -161,7 +161,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/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/infiniband/hw/ocrdma/ocrdma_hw.c +3 -3
@@ -150,7 +150,7 @@ enum ib_qp_state get_ibqp_state(enum ocrdma_qp_state qps)return IB_QPS_SQE ;case OCRDMA_QPS_ERR :return IB_QPS_ERR ; - }; + }return IB_QPS_ERR ; }
@@ -171,7 +171,7 @@ static enum ocrdma_qp_state get_ocrdma_qp_state(enum ib_qp_state qps)return OCRDMA_QPS_SQE ;case IB_QPS_ERR :return OCRDMA_QPS_ERR ; - }; + }return OCRDMA_QPS_ERR ; }
@@ -1982,7 +1982,7 @@ int ocrdma_mbx_create_qp(struct ocrdma_qp *qp, struct ib_qp_init_attr *attrs,break ;default :return -EINVAL ; - }; + } cmd =ocrdma_init_emb_mqe (OCRDMA_CMD_CREATE_QP ,sizeof (*cmd));if (!cmd)
drivers/infiniband/hw/ocrdma/ocrdma_main.c +1 -1
@@ -531,7 +531,7 @@ static void ocrdma_event_handler(struct ocrdma_dev *dev, u32 event)case BE_DEV_DOWN :ocrdma_close (dev);break ; - }; + } }static struct ocrdma_driver ocrdma_drv = {
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +3 -3
@@ -141,7 +141,7 @@ static inline void get_link_speed_and_width(struct ocrdma_dev *dev,/* Unsupported */ *ib_speed =IB_SPEED_SDR ; *ib_width =IB_WIDTH_1X ; - }; + } }
@@ -2331,7 +2331,7 @@ static enum ib_wc_status ocrdma_to_ibwc_err(u16 status)default : ibwc_status =IB_WC_GENERAL_ERR ;break ; - }; + }return ibwc_status; }
@@ -2370,7 +2370,7 @@ static void ocrdma_update_wc(struct ocrdma_qp *qp, struct ib_wc *ibwc,pr_err ("%s() invalid opcode received = 0x%x\n" , __func__, hdr->cw &OCRDMA_WQE_OPCODE_MASK );break ; - }; + } } static void ocrdma_set_cqe_status_flushed(struct ocrdma_qp *qp,
drivers/input/touchscreen/mms114.c +2 -2
@@ -395,12 +395,12 @@ static struct mms114_platform_data *mms114_parse_dt(struct device *dev)if (of_property_read_u32 (np,"x-size" , &pdata->x_size)) {dev_err (dev,"failed to get x-size property\n" );return NULL ; - }; + }if (of_property_read_u32 (np,"y-size" , &pdata->y_size)) {dev_err (dev,"failed to get y-size property\n" );return NULL ; - }; + }of_property_read_u32 (np,"contact-threshold" , &pdata->contact_threshold);
drivers/iommu/fsl_pamu_domain.c +2 -2
@@ -860,7 +860,7 @@ static int fsl_pamu_set_domain_attr(struct iommu_domain *domain,pr_debug ("Unsupported attribute type\n" ); ret = -EINVAL ;break ; - }; + }return ret; }
@@ -887,7 +887,7 @@ static int fsl_pamu_get_domain_attr(struct iommu_domain *domain,pr_debug ("Unsupported attribute type\n" ); ret = -EINVAL ;break ; - }; + }return ret; }
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/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
@@ -1857,7 +1857,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/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/media/common/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/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
@@ -739,7 +739,7 @@ static int cx24123_set_voltage(struct dvb_frontend *fe,return 0 ;default :return -EINVAL ; - }; + }return 0 ; }
drivers/media/dvb-frontends/tda8083.c +2 -2
@@ -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)
drivers/media/i2c/soc_camera/ov9640.c +1 -1
@@ -371,7 +371,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/platform/exynos4-is/fimc-isp.c +1 -1
@@ -511,7 +511,7 @@ static int __ctrl_set_metering(struct fimc_is *is, unsigned int value)break ;default :return -EINVAL ; - }; + }__is_set_isp_metering (is,IS_METERING_CONFIG_CMD , val);return 0 ;
drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c +1 -1
@@ -111,7 +111,7 @@ static int s5p_mfc_open_inst_cmd_v5(struct s5p_mfc_ctx *ctx)break ;default : h2r_args.arg[0 ] =S5P_FIMV_CODEC_NONE ; - }; + } h2r_args.arg[1 ] =0 ;/* no crc & no pixelcache */ h2r_args.arg[2 ] = ctx->ctx.ofs; h2r_args.arg[3 ] = ctx->ctx.size;
drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c +1 -1
@@ -113,7 +113,7 @@ static int s5p_mfc_open_inst_cmd_v6(struct s5p_mfc_ctx *ctx)break ;default : codec_type =S5P_FIMV_CODEC_NONE_V6 ; - }; + }mfc_write (dev, codec_type,S5P_FIMV_CODEC_TYPE_V6 );mfc_write (dev, ctx->ctx.dma,S5P_FIMV_CONTEXT_MEM_ADDR_V6 );mfc_write (dev, ctx->ctx.size,S5P_FIMV_CONTEXT_MEM_SIZE_V6 );
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c +1 -1
@@ -1582,7 +1582,7 @@ static int s5p_mfc_get_int_reason_v5(struct s5p_mfc_dev *dev)break ;default : reason =S5P_MFC_R2H_CMD_EMPTY ; - }; + }return reason; }
drivers/media/platform/s5p-tv/mixer_grp_layer.c +1 -1
@@ -226,7 +226,7 @@ static void mxr_graph_fix_geometry(struct mxr_layer *layer, src->width + src->x_offset, 32767); src->full_height =clamp_val (src->full_height, src->height + src->y_offset,2047 ); - }; + } }/* PUBLIC API */
drivers/media/platform/s5p-tv/mixer_vp_layer.c +1 -1
@@ -197,7 +197,7 @@ static void mxr_vp_fix_geometry(struct mxr_layer *layer, ALIGN(src->width + src->x_offset, 8), 8192U); src->full_height =clamp (src->full_height, src->height + src->y_offset,8192U ); - }; + } }/* PUBLIC API */
drivers/media/radio/si470x/radio-si470x-common.c +1 -1
@@ -254,7 +254,7 @@ static unsigned int si470x_get_step(struct si470x_device *radio)/* 2: 50 kHz */ default :return 50 *16 ; - }; + } }
drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c +1 -1
@@ -202,7 +202,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/media/v4l2-core/v4l2-ctrls.c +1 -1
@@ -583,7 +583,7 @@ const s64 const *v4l2_ctrl_get_int_menu(u32 id, u32 *len)default : *len =0 ;return NULL ; - }; + } }EXPORT_SYMBOL (v4l2_ctrl_get_int_menu);
drivers/memstick/core/mspro_block.c +1 -1
@@ -280,7 +280,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
@@ -755,7 +755,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
@@ -533,7 +533,7 @@ static int tifm_ms_set_param(struct memstick_host *msh, }else return -EINVAL ;break ; - }; + }return 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/mfd/stmpe.c +1 -1
@@ -706,7 +706,7 @@ static int stmpe1801_reset(struct stmpe *stmpe)if (!(ret &STMPE1801_MSK_SYS_CTRL_RESET ))return 0 ;usleep_range (100 ,200 ); - }; + }return -EIO ; }
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
@@ -366,7 +366,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
@@ -305,7 +305,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/vub300.c +3 -3
@@ -563,7 +563,7 @@ static void add_offloaded_reg(struct vub300_mmc_host *vub300, i +=1 ;continue ; } - }; + }__add_offloaded_reg_to_fifo (vub300, register_access, func); }
@@ -1374,7 +1374,7 @@ static void download_offload_pseudocode(struct vub300_mmc_host *vub300) l +=snprintf (vub300->vub_name + l,sizeof (vub300->vub_name) - l,"_%04X%04X" , sf->vendor, sf->device); - }; + }snprintf (vub300->vub_name + l,sizeof (vub300->vub_name) - l,".bin" );dev_info (&vub300->udev->dev,"requesting offload firmware %s\n" , vub300->vub_name);
@@ -1895,7 +1895,7 @@ static int satisfy_request_from_offloaded_data(struct vub300_mmc_host *vub300, i +=1 ;continue ; } - }; + }if (vub300->total_offload_count ==0 )return 0 ;else if (vub300->fn[func].offload_count ==0 )
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/mtd/nand/mpc5121_nfc.c +1 -1
@@ -450,7 +450,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/mtd/ubi/cdev.c +1 -1
@@ -924,7 +924,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/ethernet/mellanox/mlx4/cmd.c +1 -1
@@ -2372,7 +2372,7 @@ int mlx4_set_vf_link_state(struct mlx4_dev *dev, int port, int vf, int link_statmlx4_warn (dev,"unknown value for link_state %02x on slave %d port %d\n" , link_state, slave, port);return -EINVAL ; - }; + } s_info = &priv->mfunc.master.vf_admin[slave].vport[port]; s_info->link_state = link_state;
drivers/net/ethernet/mellanox/mlx4/eq.c +1 -1
@@ -725,7 +725,7 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq) !!(eqe->owner &0x80 ) ^ !!(eq->cons_index & eq->nent) ? "HW" : "SW");break ; - }; + } ++eq->cons_index; eqes_found =1 ;
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +1 -1
@@ -271,7 +271,7 @@ static const char *ResourceType(enum mlx4_resource rt)case RES_FS_RULE :return "RES_FS_RULE" ;case RES_XRCD :return "RES_XRCD" ;default :return "Unknown resource type !!!" ; - }; + } }int mlx4_init_resource_tracker (struct mlx4_dev *dev)
drivers/net/usb/sr9700.c +1 -1
@@ -434,7 +434,7 @@ static int sr9700_rx_fixup(struct usbnet *dev, struct sk_buff *skb)usbnet_skb_return (dev, sr_skb);skb_pull (skb, len +SR_RX_OVERHEAD ); - }; + }return 0 ; }
drivers/net/wireless/ath/ath10k/htt_rx.c +1 -1
@@ -1201,7 +1201,7 @@ void ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)ath10k_dbg_dump (ATH10K_DBG_HTT_DUMP ,NULL ,"htt event: " , skb->data, skb->len);break ; - }; + }/* Free the indication buffer */ dev_kfree_skb_any (skb);
drivers/net/wireless/ath/ath6kl/init.c +1 -1
@@ -1091,7 +1091,7 @@ static int ath6kl_fetch_fw_apin(struct ath6kl *ar, const char *name) len -= ie_len; data += ie_len; - }; + } ret =0 ; out:
drivers/net/wireless/iwlwifi/mvm/d3.c +1 -1
@@ -569,7 +569,7 @@ static void iwl_mvm_build_tcp_packet(struct ieee80211_vif *vif, mask[5 ] =0x80 ;/* match tcp flags */ /* leave rest (0 or set for MVM_TCP_RX_WAKE) */ break ; - }; + } *pseudo_hdr_csum =pseudo_hdr_check (ip_tot_len -sizeof (struct iphdr ), pkt->ip.saddr, pkt->ip.daddr);
drivers/net/wireless/iwlwifi/mvm/led.c +1 -1
@@ -103,7 +103,7 @@ int iwl_mvm_leds_init(struct iwl_mvm *mvm)return 0 ;default :return -EINVAL ; - }; + } mvm->led.name =kasprintf (GFP_KERNEL ,"%s-led" ,wiphy_name (mvm->hw->wiphy));
drivers/net/wireless/iwlwifi/mvm/scan.c +1 -1
@@ -407,7 +407,7 @@ static bool iwl_mvm_scan_abort_notif(struct iwl_notif_wait_data *notif_wait,default :WARN_ON (1 );return false; - }; + } }void iwl_mvm_cancel_scan (struct iwl_mvm *mvm)
drivers/pci/proc.c +1 -1
@@ -222,7 +222,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
@@ -441,7 +441,7 @@ static int 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
@@ -660,7 +660,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/pinctrl/pinctrl-exynos5440.c +1 -1
@@ -296,7 +296,7 @@ static void exynos5440_dt_free_map(struct pinctrl_dev *pctldev,if (!idx)kfree (map[idx].data.configs.group_or_pin); } - }; + }kfree (map); }
drivers/pinctrl/pinctrl-samsung.c +1 -1
@@ -213,7 +213,7 @@ static void samsung_dt_free_map(struct pinctrl_dev *pctldev,if (!idx)kfree (map[idx].data.configs.group_or_pin); } - }; + }kfree (map); }
drivers/pinctrl/pinctrl-sunxi.c +1 -1
@@ -901,7 +901,7 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev)irq_set_chip_and_handler (irqno, &sunxi_pinctrl_irq_chip, handle_simple_irq);irq_set_chip_data (irqno, pctl); - }; + }irq_set_chained_handler (pctl->irq, sunxi_pinctrl_irq_handler);irq_set_handler_data (pctl->irq, pctl);
drivers/pinctrl/pinctrl-tz1090-pdc.c +2 -2
@@ -695,7 +695,7 @@ static int tz1090_pdc_pinconf_reg(struct pinctrl_dev *pctldev,break ;default :return -ENOTSUPP ; - }; + }/* Only input bias parameters supported */ *reg =REG_GPIO_CONTROL2 ;
@@ -828,7 +828,7 @@ static int tz1090_pdc_pinconf_group_reg(struct pinctrl_dev *pctldev,break ;default :return -ENOTSUPP ; - }; + }/* Calculate field information */ *mask = (BIT (*width) -1 ) << *shift;
drivers/pinctrl/pinctrl-tz1090.c +2 -2
@@ -1719,7 +1719,7 @@ static int tz1090_pinconf_reg(struct pinctrl_dev *pctldev,break ;default :return -ENOTSUPP ; - }; + }/* Only input bias parameters supported */ pu = &tz1090_pinconf_pullup[pin];
@@ -1848,7 +1848,7 @@ static int tz1090_pinconf_group_reg(struct pinctrl_dev *pctldev,break ;default :return -ENOTSUPP ; - }; + }/* Calculate field information */ *shift = g->slw_bit * *width;
drivers/power/ab8500_charger.c +3 -3
@@ -785,7 +785,7 @@ static int ab8500_charger_max_usb_curr(struct ab8500_charger *di, di->max_usb_in_curr.usb_type_max =USB_CH_IP_CUR_LVL_0P05 ; ret = -ENXIO ;break ; - }; + } di->max_usb_in_curr.set_max = di->max_usb_in_curr.usb_type_max; dev_dbg(di->dev, "USB Type - 0x%02x MaxCurr: %d",
@@ -1075,7 +1075,7 @@ static int ab8500_charger_get_usb_cur(struct ab8500_charger *di) di->max_usb_in_curr.usb_type_max =USB_CH_IP_CUR_LVL_0P05 ; ret = -EPERM ;break ; - }; + } di->max_usb_in_curr.set_max = di->max_usb_in_curr.usb_type_max;return ret; }
@@ -2485,7 +2485,7 @@ static void ab8500_charger_usb_state_changed_work(struct work_struct *work)default :break ; - }; + } }/**
drivers/power/ab8500_fg.c +7 -7
@@ -2237,10 +2237,10 @@ static int ab8500_fg_get_ext_psy_data(struct device *dev, void *data)ab8500_fg_update_cap_scalers (di);queue_work (di->fg_wq, &di->fg_work);break ; - }; + }default :break ; - }; + }break ;case POWER_SUPPLY_PROP_TECHNOLOGY :switch (ext->type) {
@@ -2349,7 +2349,7 @@ static int ab8500_fg_init_hw_registers(struct ab8500_fg *di)if (ret) {dev_err (di->dev,"%s write failed AB8505_RTC_PCUT_MAX_TIME_REG\n" , __func__); goto out; - }; + } ret =abx500_set_register_interruptible (di->dev,AB8500_RTC ,AB8505_RTC_PCUT_FLAG_TIME_REG , di->bm->fg_params->pcut_flag_time);
@@ -2357,7 +2357,7 @@ static int ab8500_fg_init_hw_registers(struct ab8500_fg *di)if (ret) {dev_err (di->dev,"%s write failed AB8505_RTC_PCUT_FLAG_TIME_REG\n" , __func__); goto out; - }; + } ret =abx500_set_register_interruptible (di->dev,AB8500_RTC ,AB8505_RTC_PCUT_RESTART_REG , di->bm->fg_params->pcut_max_restart);
@@ -2365,7 +2365,7 @@ static int ab8500_fg_init_hw_registers(struct ab8500_fg *di)if (ret) {dev_err (di->dev,"%s write failed AB8505_RTC_PCUT_RESTART_REG\n" , __func__); goto out; - }; + } ret =abx500_set_register_interruptible (di->dev,AB8500_RTC ,AB8505_RTC_PCUT_DEBOUNCE_REG , di->bm->fg_params->pcut_debounce_time);
@@ -2373,7 +2373,7 @@ static int ab8500_fg_init_hw_registers(struct ab8500_fg *di)if (ret) {dev_err (di->dev,"%s write failed AB8505_RTC_PCUT_DEBOUNCE_REG\n" , __func__); goto out; - }; + } ret =abx500_set_register_interruptible (di->dev,AB8500_RTC ,AB8505_RTC_PCUT_CTL_STATUS_REG , di->bm->fg_params->pcut_enable);
@@ -2381,7 +2381,7 @@ static int ab8500_fg_init_hw_registers(struct ab8500_fg *di)if (ret) {dev_err (di->dev,"%s write failed AB8505_RTC_PCUT_CTL_STATUS_REG\n" , __func__); goto out; - }; + } } out:return ret;
drivers/power/abx500_chargalg.c +1 -1
@@ -1892,7 +1892,7 @@ static ssize_t abx500_chargalg_en_store(struct abx500_chargalg *di,"Enter 0. Disable AC/USB Charging\n" "1. Enable AC charging\n" "2. Enable USB Charging\n"); - }; + }return strlen (buf); }
drivers/power/reset/vexpress-poweroff.c +1 -1
@@ -118,7 +118,7 @@ static int vexpress_reset_probe(struct platform_device *pdev) arm_pm_restart = vexpress_restart;device_create_file (&pdev->dev, &dev_attr_active);break ; - }; + }return 0 ; }
drivers/regulator/da9063-regulator.c +1 -1
@@ -698,7 +698,7 @@ static struct da9063_regulators_pdata *da9063_parse_regulators_dt( rdata->initdata = da9063_matches[i].init_data; n++; - }; + } *da9063_reg_matches = da9063_matches;return pdata;
drivers/rpmsg/virtio_rpmsg_bus.c +1 -1
@@ -861,7 +861,7 @@ static void rpmsg_recv_done(struct virtqueue *rvq) msgs_received++; msg =virtqueue_get_buf (rvq, &len); - }; + }dev_dbg (dev,"Received %u messages\n" , msgs_received);
drivers/rtc/rtc-rs5c372.c +1 -1
@@ -650,7 +650,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/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/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/openprom.c +1 -1
@@ -654,7 +654,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 +12 -12
@@ -472,7 +472,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;
@@ -552,7 +552,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 *))
@@ -732,7 +732,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 );
@@ -752,7 +752,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 );
@@ -782,7 +782,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 ;
@@ -805,7 +805,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 ; }
@@ -838,7 +838,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" );
@@ -856,7 +856,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 );
@@ -877,7 +877,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 */
@@ -1001,7 +1001,7 @@ static int __init aha1542_detect(struct scsi_host_template * tpnt)case 10 : atbt =0x03 ; break; - }; + } setup_dmaspeed[0 ] = atbt; }#endif
@@ -1177,7 +1177,7 @@ unregister:scsi_unregister (shpnt);continue ; - }; + }return count; }
@@ -1498,7 +1498,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/aic7xxx/aicasm/aicasm_symbol.c +1 -1
@@ -400,7 +400,7 @@ aic_print_reg_dump_end(FILE *ofile, FILE *dfile,if (num_entries !=0 )fprintf (dfile,"\n" -"};\n" +"}\n" "\n" ); fprintf(dfile,
drivers/scsi/bfa/bfa_fcs_lport.c +1 -1
@@ -4330,7 +4330,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
@@ -2461,7 +2461,7 @@ bfa_fcs_rport_hal_online_action(struct bfa_fcs_rport_s *rport)bfa_fcs_itnim_brp_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/bnx2fc/bnx2fc_fcoe.c +3 -3
@@ -889,7 +889,7 @@ static void bnx2fc_indicate_netevent(void *context, unsigned long event,*/ if (interface->enabled)fcoe_ctlr_link_up (ctlr); - }; + } }else if (fcoe_ctlr_link_down (ctlr)) {switch (cdev->enabled) {case FCOE_CTLR_DISABLED :
@@ -909,7 +909,7 @@ static void bnx2fc_indicate_netevent(void *context, unsigned long event,put_cpu ();fcoe_clean_pending_queue (lport); wait_for_upload =1 ; - }; + } } }mutex_unlock (&bnx2fc_dev_lock);
@@ -2083,7 +2083,7 @@ static int bnx2fc_ctlr_enabled(struct fcoe_ctlr_device *cdev)case FCOE_CTLR_UNUSED :default :return -ENOTSUPP ; - }; + } }enum bnx2fc_create_link_state {
drivers/scsi/fcoe/fcoe.c +3 -3
@@ -2047,7 +2047,7 @@ static int fcoe_device_notification(struct notifier_block *notifier,case FCOE_CTLR_ENABLED :case FCOE_CTLR_UNUSED :fcoe_ctlr_link_up (ctlr); - }; + } }else if (fcoe_ctlr_link_down (ctlr)) {switch (cdev->enabled) {case FCOE_CTLR_DISABLED :
@@ -2059,7 +2059,7 @@ static int fcoe_device_notification(struct notifier_block *notifier, stats->LinkFailureCount++;put_cpu ();fcoe_clean_pending_queue (lport); - }; + } } out:return rc;
@@ -2156,7 +2156,7 @@ static int fcoe_ctlr_enabled(struct fcoe_ctlr_device *cdev)case FCOE_CTLR_UNUSED :default :return -ENOTSUPP ; - }; + } }/**
drivers/scsi/fcoe/fcoe_sysfs.c +2 -2
@@ -324,7 +324,7 @@ static ssize_t store_ctlr_mode(struct device *dev,default :LIBFCOE_SYSFS_DBG (ctlr,"Mode change not supported." );return -ENOTSUPP ; - }; + } } static FCOE_DEVICE_ATTR(ctlr, mode, S_IRUGO | S_IWUSR,
@@ -350,7 +350,7 @@ static ssize_t store_ctlr_enabled(struct device *dev,break ;case FCOE_CTLR_UNUSED :return -ENOTSUPP ; - }; + } rc = ctlr->f->set_fcoe_ctlr_enabled (ctlr);if (rc)
drivers/scsi/fnic/fnic_main.c +1 -1
@@ -422,7 +422,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 +19 -19
@@ -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 ;
@@ -2232,7 +2232,7 @@ static int ibmvfc_cancel_all(struct scsi_device *sdev, int type)return 0 ;default :return -EIO ; - }; + } }sdev_printk (KERN_INFO , sdev,"Successfully cancelled outstanding commands\n" );
@@ -2664,7 +2664,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 :
@@ -2718,7 +2718,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 ; - }; + } }/**
@@ -3386,7 +3386,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);
@@ -3482,7 +3482,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);
@@ -3553,7 +3553,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);
@@ -3657,7 +3657,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);
@@ -3869,7 +3869,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);
@@ -4270,7 +4270,7 @@ static int __ibmvfc_work_to_do(struct ibmvfc_host *vhost)case IBMVFC_HOST_ACTION_REENABLE :default :break ; - }; + }return 1 ; }
@@ -4498,7 +4498,7 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost)break ;default :break ; - }; + }spin_unlock_irqrestore (vhost->host->host_lock, flags); }
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/ipr.c +2 -2
@@ -1119,7 +1119,7 @@ static void ipr_update_ata_class(struct ipr_resource_entry *res, unsigned int prdefault : res->ata_class =ATA_DEV_UNKNOWN ;break ; - }; + } }/**
@@ -5647,7 +5647,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/nsp32.c +2 -2
@@ -1260,7 +1260,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" ); }
@@ -1855,7 +1855,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/scsi/pmcraid.c +1 -1
@@ -3186,7 +3186,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
@@ -1139,7 +1139,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/scsi_tgt_if.c +1 -1
@@ -253,7 +253,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 +3 -3
@@ -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 ;-)
@@ -494,7 +494,7 @@ void sym_fw_bind_script(struct sym_hcb *np, u32 *start, int len)default : relocs =0 ;break ; - }; + }/* * Scriptify:) the opcode.
@@ -550,5 +550,5 @@ void sym_fw_bind_script(struct sym_hcb *np, u32 *start, int len) *cur++ =cpu_to_scr (new); } - }; + } }
drivers/scsi/ultrastor.c +1 -1
@@ -379,7 +379,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/staging/iio/adc/ad7291.c +1 -1
@@ -290,7 +290,7 @@ static int ad7291_read_event_value(struct iio_dev *indio_dev,return 0 ;default :return -EINVAL ; - }; + } } static int ad7291_write_event_value(struct iio_dev *indio_dev,
drivers/staging/iio/cdc/ad7150.c +1 -1
@@ -300,7 +300,7 @@ static int ad7150_read_event_value(struct iio_dev *indio_dev,default :return -EINVAL ; - }; + } } static int ad7150_write_event_value(struct iio_dev *indio_dev,
drivers/staging/imx-drm/imx-tve.c +1 -1
@@ -696,7 +696,7 @@ static int imx_tve_probe(struct platform_device *pdev)if (val !=0x00100000 ) {dev_err (&pdev->dev,"configuration register default value indicates this is not a TVEv2\n" );return -ENODEV ; - }; + }/* disable cable detection for VGA mode */ ret =regmap_write (tve->regmap,TVE_CD_CONT_REG ,0 );
drivers/staging/lustre/lustre/lvfs/lvfs_linux.c +1 -1
@@ -278,7 +278,7 @@ __s64 lprocfs_read_helper(struct lprocfs_counter *lc,break ;default :break ; - }; + }return ret; }
drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c +1 -1
@@ -207,7 +207,7 @@ static void enc_pools_release_free_pages(long npages) p_idx++; g_idx =0 ; } - }; + }/* free unused pools */ while (p_idx_max1 < p_idx_max2) {
drivers/staging/rtl8188eu/core/rtw_recv.c +1 -1
@@ -1583,7 +1583,7 @@ _func_enter_; pfhdr->attrib.icv_len = pnfhdr->attrib.icv_len; plist =get_next (plist); - }; + }/* free the defrag_q queue and return the prframe */ rtw_free_recvframe_queue (defrag_q, pfree_recv_queue);
drivers/staging/rtl8188eu/hal/hal_com.c +2 -2
@@ -225,7 +225,7 @@ static void two_out_pipe(struct adapter *adapter, bool wifi_cfg)if (wifi_cfg) {/* WMM */ /* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */ -/* 0, 1, 0, 1, 0, 0, 0, 0, 0}; */ +/* 0, 1, 0, 1, 0, 0, 0, 0, 0} */ /* 0:H, 1:L */ pdvobjpriv->Queue2Pipe[0 ] = pdvobjpriv->RtOutPipe[1 ];/* VO */
@@ -261,7 +261,7 @@ static void three_out_pipe(struct adapter *adapter, bool wifi_cfg)if (wifi_cfg) {/* for WMM */ /* BK, BE, VI, VO, BCN, CMD, MGT, HIGH, HCCA */ -/* 1, 2, 1, 0, 0, 0, 0, 0, 0}; */ +/* 1, 2, 1, 0, 0, 0, 0, 0, 0} */ /* 0:H, 1:N, 2:L */ pdvobjpriv->Queue2Pipe[0 ] = pdvobjpriv->RtOutPipe[0 ];/* VO */
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +2 -2
@@ -1890,7 +1890,7 @@ void rtl8192_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, ret =rtl8192_tx (dev, skb);if (ret !=0 ) {kfree_skb (skb); - }; + }if (queue_index !=MGNT_QUEUE ) { priv->rtllib->stats.tx_bytes += (skb->len -
@@ -1932,7 +1932,7 @@ int rtl8192_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ret =rtl8192_tx (dev, skb);if (ret !=0 ) {kfree_skb (skb); - }; + } }
drivers/target/sbp/sbp_target.c +1 -1
@@ -1025,7 +1025,7 @@ static void tgt_agent_fetch_work(struct work_struct *work) agent->state =AGENT_STATE_SUSPENDED ;spin_unlock_bh (&agent->lock); - }; + } } static struct sbp_target_agent *sbp_target_agent_register(
drivers/tty/nozomi.c +3 -3
@@ -959,7 +959,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));
@@ -1025,7 +1025,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 ; }
@@ -1805,7 +1805,7 @@ static int ntty_ioctl(struct tty_struct *tty,default :DBG1 ("ERR: 0x%08X, %d" , cmd, cmd);break ; - }; + }return rval; }
drivers/tty/serial/bfin_uart.c +2 -2
@@ -680,7 +680,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 ) {
@@ -765,7 +765,7 @@ static void bfin_serial_shutdown(struct uart_port *port)break ;default : break; - }; + }#endif free_irq (uart->rx_irq, uart);free_irq (uart->tx_irq, uart);
drivers/tty/serial/ip22zilog.c +1 -1
@@ -832,7 +832,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/max310x.c +1 -1
@@ -690,7 +690,7 @@ static void max310x_handle_tx(struct uart_port *port)max310x_port_write (port,MAX310X_THR_REG , xmit->buf[xmit->tail]); xmit->tail = (xmit->tail +1 ) & (UART_XMIT_SIZE -1 ); - }; + } }if (uart_circ_chars_pending (xmit) <WAKEUP_CHARS )
drivers/tty/serial/pmac_zilog.c +1 -1
@@ -1072,7 +1072,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
@@ -894,7 +894,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
@@ -319,7 +319,7 @@ static void sunzilog_kbdms_receive_chars(struct uart_sunzilog_port *up,serio_interrupt (&up->serio, ch,0 );#endif break ; - }; + } } }
@@ -897,7 +897,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 ;
@@ -1239,7 +1239,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/tty/serial/ucc_uart.c +1 -1
@@ -269,7 +269,7 @@ static unsigned int qe_uart_tx_empty(struct uart_port *port)return 1 ; bdp++; - }; + } }/*
drivers/usb/core/hcd.c +1 -1
@@ -1813,7 +1813,7 @@ rescan: s ="-intr" ;break ;default : s ="-iso" ;break ; - }; + } s; }));usb_put_urb (urb);
drivers/usb/core/hub.c +1 -1
@@ -433,7 +433,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/dwc3/ep0.c +3 -3
@@ -352,7 +352,7 @@ static int dwc3_ep0_handle_status(struct dwc3 *dwc,break ;default :return -EINVAL ; - }; + } response_pkt = (__le16 *) dwc->setup_buf; *response_pkt =cpu_to_le16 (usb_status);
@@ -470,7 +470,7 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc,default :return -EINVAL ; - }; + }return 0 ; }
@@ -709,7 +709,7 @@ static int dwc3_ep0_std_request(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)dev_vdbg (dwc->dev,"Forwarding to gadget driver\n" ); ret =dwc3_ep0_delegate_req (dwc, ctrl);break ; - }; + }return ret; }
drivers/usb/gadget/composite.c +1 -1
@@ -354,7 +354,7 @@ static u8 encode_bMaxPower(enum usb_device_speed speed,return DIV_ROUND_UP (val,8 );default :return DIV_ROUND_UP (val,2 ); - }; + } } static int config_buf(struct usb_configuration *config,
drivers/usb/gadget/dummy_hcd.c +3 -3
@@ -544,7 +544,7 @@ static int dummy_enable(struct usb_ep *_ep,default : val ="ctrl" ;break ; - }; val; }), + } val; }), max, ep->stream_en ? "enabled" : "disabled");/* at this point real hardware should be NAKing transfers
@@ -2271,7 +2271,7 @@ static inline ssize_t show_urb(char *buf, size_t size, struct urb *urb)default : s ="?" ;break ; - }; s; }), + } s; }), ep, ep ? (usb_pipein(urb->pipe) ? "in" : "out") : "", ({ char *s; \ switch (usb_pipetype(urb->pipe)) { \
@@ -2287,7 +2287,7 @@ static inline ssize_t show_urb(char *buf, size_t size, struct urb *urb)default : \ s ="-iso" ; \break ; \ - }; s; }), + } s; }), urb->actual_length, urb->transfer_buffer_length); }
drivers/usb/gadget/goku_udc.c +1 -1
@@ -1165,7 +1165,7 @@ static int udc_proc_read(struct seq_file *m, void *v) s ="invalid" ;break ;default : s ="?" ;break ; - }; s; }), + } s; }), (tmp & EPxSTATUS_TOGGLE) ?"data1" :"data0" , (tmp & EPxSTATUS_SUSPEND) ?" suspend" :"" , (tmp & EPxSTATUS_FIFO_DISABLE) ? " disable" : "",
drivers/usb/gadget/net2280.c +2 -2
@@ -129,7 +129,7 @@ static char *type_string (u8 bmAttributes)case USB_ENDPOINT_XFER_BULK :return "bulk" ;case USB_ENDPOINT_XFER_ISOC :return "iso" ; case USB_ENDPOINT_XFER_INT: return "intr"; - }; + }return "control" ; }#endif
@@ -1630,7 +1630,7 @@ static ssize_t queues_show(struct device *_dev, struct device_attribute *attr, val ="intr" ;break ;default : val ="iso" ;break ; - }; val; }), + } val; }),usb_endpoint_maxp (d) &0x1fff , ep->dma ?"dma" :"pio" , ep->fifo_size );
drivers/usb/gadget/rndis.c +1 -1
@@ -1068,7 +1068,7 @@ static int rndis_proc_show(struct seq_file *m, void *v) s ="RNDIS_INITIALIZED" ;break ;case RNDIS_DATA_INITIALIZED : s ="RNDIS_DATA_INITIALIZED" ;break ; - }; s; }), + } s; }), param->medium, (param->media_state) ?0 : param->speed*100 , (param->media_state) ? "disconnected" : "connected",
drivers/usb/gadget/tcm_usb_gadget.c +2 -2
@@ -472,7 +472,7 @@ static int usbg_bot_setup(struct usb_function *f,bot_enqueue_cmd_cbw (fu);return 0 ;break ; - }; + }return -ENOTSUPP ; }
@@ -617,7 +617,7 @@ static void uasp_status_data_cmpl(struct usb_ep *ep, struct usb_request *req)default :BUG (); - }; + }return ; cleanup:
drivers/usb/host/ehci-dbg.c +1 -1
@@ -379,7 +379,7 @@ struct debug_buffer {case QH_LOW_SPEED : tmp ='l' ;break ; \case QH_HIGH_SPEED : tmp ='h' ;break ; \default : tmp ='?' ;break ; \ - }; tmp; }) + } tmp; })static inline char token_mark (struct ehci_hcd *ehci,__hc32 token) {
drivers/usb/host/fotg210-hcd.c +1 -1
@@ -412,7 +412,7 @@ struct debug_buffer { tmp ='h' ;break ; \default : \ tmp ='?' ;break ; \ - }; tmp; }) + } tmp; })static inline char token_mark (struct fotg210_hcd *fotg210,__hc32 token) {
drivers/usb/host/fusbh200-hcd.c +1 -1
@@ -402,7 +402,7 @@ struct debug_buffer {case QH_LOW_SPEED : tmp ='l' ;break ; \case QH_HIGH_SPEED : tmp ='h' ;break ; \default : tmp ='?' ;break ; \ - }; tmp; }) + } tmp; })static inline char token_mark (struct fusbh200_hcd *fusbh200,__hc32 token) {
drivers/usb/host/isp1362-hcd.c +1 -1
@@ -2108,7 +2108,7 @@ static int isp1362_show(struct seq_file *s, void *unused)default : s ="?" ;break ; - }; + } s;}), ep->maxpacket) ;list_for_each_entry (urb, &ep->hep->urb_list, urb_list) { seq_printf(s, " urb%p, %d/%d\n", urb,
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
@@ -1413,7 +1413,7 @@ static int sl811h_show(struct seq_file *s, void *unused)case SL11H_CTL1MASK_SE0 : s =" se0/reset" ;break ;case SL11H_CTL1MASK_K : s =" k/resume" ;break ;default : s ="j" ;break ; - }; s; }), + } s; }), (t &SL11H_CTL1MASK_LSPD ) ?" lowspeed" :"" , (t & SL11H_CTL1MASK_SUSPEND) ? " suspend" : "");
@@ -1446,7 +1446,7 @@ static int sl811h_show(struct seq_file *s, void *unused)case USB_PID_SETUP : s ="setup" ;break ;case USB_PID_ACK : s ="status" ;break ;default : s ="?" ;break ; - }; s;}), + } s;}), ep->maxpacket, ep->nak_count, ep->error_count); list_for_each_entry (urb, &ep->hep->urb_list, urb_list) {
drivers/usb/host/uhci-pci.c +1 -1
@@ -178,7 +178,7 @@ static int uhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)dev_warn (uhci_dev (uhci),"Root hub isn't suspended!\n" ); rc = -EBUSY ; goto done; - }; + }/* All PCI host controllers are required to disable IRQ generation * at the source, so we must turn off PIRQ.
drivers/usb/host/whci/hcd.c +2 -2
@@ -134,7 +134,7 @@ static int whc_urb_enqueue(struct usb_hcd *usb_hcd, struct urb *urb,default : ret =asl_urb_enqueue (whc, urb, mem_flags);break ; - }; + }return ret; }
@@ -160,7 +160,7 @@ static int whc_urb_dequeue(struct usb_hcd *usb_hcd, struct urb *urb, int status)default : ret =asl_urb_dequeue (whc, urb, status);break ; - }; + }return ret; }
drivers/usb/musb/musb_core.c +1 -1
@@ -617,7 +617,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,/* case 3 << MUSB_DEVCTL_VBUS_SHIFT: */ default : s ="VALID" ;break ; - }; s; }), + } s; }),VBUSERR_RETRY_COUNT - musb->vbuserr_retry, musb->port1_status);
drivers/usb/musb/musb_dsps.c +1 -1
@@ -443,7 +443,7 @@ static int get_musb_port_mode(struct device *dev)case USB_DR_MODE_OTG :default :return MUSB_PORT_MODE_DUAL_ROLE ; - }; + } } static int dsps_create_musb_pdev(struct dsps_glue *glue,
drivers/usb/musb/musb_gadget.c +1 -1
@@ -1121,7 +1121,7 @@ static int musb_gadget_enable(struct usb_ep *ep,case USB_ENDPOINT_XFER_BULK : s ="bulk" ;break ;case USB_ENDPOINT_XFER_INT : s ="int" ;break ;default : s ="iso" ;break ; - }; s; }), + } s; }), musb_ep->is_in ?"IN" :"OUT" , musb_ep->dma ?"dma, " :"" , musb_ep->packet_sz);
drivers/usb/musb/musb_host.c +1 -1
@@ -253,7 +253,7 @@ musb_start_urb(struct musb *musb, int is_in, struct musb_qh *qh)case USB_ENDPOINT_XFER_BULK : s ="-bulk" ;break ;case USB_ENDPOINT_XFER_ISOC : s ="-iso" ;break ;default : s ="-intr" ;break ; - }; s; }), + } s; }), epnum, buf + offset, len);/* Configure endpoint */
drivers/usb/phy/phy-twl4030-usb.c +1 -1
@@ -337,7 +337,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/phy/phy-ulpi-viewport.c +1 -1
@@ -36,7 +36,7 @@ static int ulpi_viewport_wait(void __iomem *view, u32 mask)return 0 ;udelay (1 ); - }; + }return -ETIMEDOUT ; }
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
@@ -973,7 +973,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
@@ -429,7 +429,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)
@@ -488,7 +488,7 @@ static void __wa_xfer_setup_hdr0(struct wa_xfer *xfer,printk (KERN_ERR "FIXME: ISOC not implemented\n" );default :BUG (); - }; + } }/*
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/uwb/ie.c +1 -1
@@ -91,7 +91,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/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/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 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/exynos/exynos_mipi_dsi_common.c +1 -1
@@ -667,7 +667,7 @@ int exynos_mipi_dsi_init_dsim(struct mipi_dsim_device *dsim)default :dev_info (dsim->dev,"data lane is invalid.\n" );return -EINVAL ; - }; + }exynos_mipi_dsi_sw_reset (dsim);exynos_mipi_dsi_func_reset (dsim);
drivers/video/fsl-diu-fb.c +1 -1
@@ -1102,7 +1102,7 @@ static int fsl_diu_cursor(struct fb_info *info, struct fb_cursor *cursor)fsl_diu_load_cursor_image (info, image, bg, fg, cursor->image.width, cursor->image.height); - }; + }/* * Show or hide the cursor. The cursor data is always stored in the
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/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" );
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/omap2/displays-new/panel-dsi-cm.c +1 -1
@@ -599,7 +599,7 @@ static int dsicm_power_on(struct panel_drv_data *ddata)if (r) {dev_err (&ddata->pdev->dev,"failed to configure DSI pins\n" ); goto err0; - }; + } r = in->ops.dsi->set_config (in, &dsi_config);if (r) {
drivers/video/omap2/dss/dispc.c +1 -1
@@ -2918,7 +2918,7 @@ static void _dispc_mgr_set_lcd_timings(enum omap_channel channel, int hsw,break ;default :BUG (); - }; + } l =dispc_read_reg (DISPC_POL_FREQ (channel)); l |=FLD_VAL (onoff,17 ,17 );
drivers/video/omap2/dss/dsi.c +1 -1
@@ -4066,7 +4066,7 @@ static int dsi_enable_video_output(struct omap_dss_device *dssdev, int channel)default : r = -EINVAL ; goto err_pix_fmt; - }; + }dsi_if_enable (dsidev, false);dsi_vc_enable (dsidev, channel, false);
drivers/video/sbuslib.c +1 -1
@@ -186,7 +186,7 @@ int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, }default :return -EINVAL ; - }; + } }EXPORT_SYMBOL (sbusfb_ioctl_helper);
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 */
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 tcx_probe(struct platform_device *op)default : j = i;break ; - }; + } par->mmap_map[i].poff = op->resource[j].start; }
drivers/video/vt8500lcdfb.c +1 -1
@@ -365,7 +365,7 @@ static int vt8500lcd_probe(struct platform_device *pdev)if (!fb_mem_virt) {pr_err ("%s: Failed to allocate framebuffer\n" , __func__);return -ENOMEM ; - }; + } fbi->fb.fix.smem_start = fb_mem_phys; fbi->fb.fix.smem_len = fb_mem_len;
drivers/watchdog/riowd.c +1 -1
@@ -141,7 +141,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
@@ -158,7 +158,7 @@ static umode_t p9mode2unixmode(struct v9fs_session_info *v9ses,default :p9_debug (P9_DEBUG_ERROR ,"Unknown special type %c %s\n" , type, stat->extension); - }; + } *rdev =MKDEV (major, minor); }else res |=S_IFREG ;
fs/befs/btree.c +1 -1
@@ -499,7 +499,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/btrfs/print-tree.c +1 -1
@@ -305,7 +305,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)print_uuid_item (l,btrfs_item_ptr_offset (l, i),btrfs_item_size_nr (l, i));break ; - }; + } } }
fs/dlm/rcom.c +1 -1
@@ -577,7 +577,7 @@ void dlm_receive_rcom(struct dlm_ls *ls, struct dlm_rcom *rc, int nodeid) lock =1 ; reply =1 ;break ; - }; + }spin_lock (&ls->ls_recover_lock); status = ls->ls_recover_status;
fs/gfs2/glops.c +1 -1
@@ -320,7 +320,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 ; - }; + }i_uid_write (&ip->i_inode,be32_to_cpu (str->di_uid));i_gid_write (&ip->i_inode,be32_to_cpu (str->di_gid));
fs/gfs2/inode.c +1 -1
@@ -1351,7 +1351,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
@@ -482,7 +482,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/hpfs/buffer.c +1 -1
@@ -25,7 +25,7 @@ void hpfs_prefetch_sectors(struct super_block *s, unsigned secno, int n)return ; }brelse (bh); - }; + }blk_start_plug (&plug);while (n >0 ) {
fs/jffs2/wbuf.c +1 -1
@@ -1275,7 +1275,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;pr_warn ("flash size adjusted to %dKiB\n" , c->flash_size); - }; + } c->wbuf_ofs =0xFFFFFFFF ; c->wbuf =kmalloc (c->wbuf_pagesize,GFP_KERNEL );
fs/lockd/clnt4xdr.c +2 -2
@@ -468,7 +468,7 @@ static void nlm4_xdr_enc_res(struct rpc_rqst *req,* struct nlm4_holder holder; * default: * void; -* }; +* } * * struct nlm4_testres { * netobj cookie;
@@ -500,7 +500,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
@@ -461,7 +461,7 @@ static void nlm_xdr_enc_res(struct rpc_rqst *req,* struct nlm_holder holder; * default: * void; -* }; +* } * * struct nlm_testres { * netobj cookie;
@@ -498,7 +498,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
@@ -479,7 +479,7 @@ out_overflow:* fattr attributes; * default: * void; -* }; +* } */ static int decode_attrstat (struct xdr_stream *xdr,struct nfs_fattr *result) {
@@ -524,7 +524,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) {
@@ -825,7 +825,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)
@@ -854,7 +854,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)
@@ -966,7 +966,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
@@ -5477,7 +5477,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
@@ -1093,7 +1093,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 +3 -3
@@ -1506,7 +1506,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))
@@ -1539,7 +1539,7 @@ static int nfs_parse_mount_options(char *raw,dfprintk (MOUNT ,"NFS: invalid " "local_lock argument\n" );return 0 ; - }; + }break ;/*
@@ -2439,7 +2439,7 @@ static void nfs_get_cache_cookie(struct super_block *sb,if (mnt_s->fscache_key) { uniq = mnt_s->fscache_key->key.uniquifier; ulen = mnt_s->fscache_key->key.uniq_len; - }; + } }else return ;
fs/nfsd/nfs4callback.c +1 -1
@@ -392,7 +392,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
@@ -2001,7 +2001,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/nfsd/nfs4xdr.c +1 -1
@@ -1937,7 +1937,7 @@ static u32 nfs4_file_type(umode_t mode)case S_IFREG :return NF4REG ;case S_IFSOCK :return NF4SOCK ;default :return NF4BAD ; - }; + } } static __be32
fs/notify/fanotify/fanotify.c +1 -1
@@ -32,7 +32,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/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/ntfs/super.c +2 -2
@@ -1623,7 +1623,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)
@@ -1692,7 +1692,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)
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 occurred 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/reiserfs/bitmap.c +1 -1
@@ -562,7 +562,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);
fs/ubifs/sb.c +1 -1
@@ -584,7 +584,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;
kernel/audit_watch.c +1 -1
@@ -499,7 +499,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/auditfilter.c +2 -2
@@ -319,7 +319,7 @@ static int audit_field_valid(struct audit_entry *entry, struct audit_field *f) entry->rule.listnr != AUDIT_FILTER_USER)return -EINVAL ;break ; - }; + }switch (f->type) {default :
@@ -385,7 +385,7 @@ static int audit_field_valid(struct audit_entry *entry, struct audit_field *f)if (f->val >AUDIT_MAX_FIELD_COMPARE )return -EINVAL ;break ; - }; + }return 0 ; }
kernel/res_counter.c +1 -1
@@ -135,7 +135,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
@@ -71,7 +71,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)free_percpu (cfd->csd);break ;#endif - }; + }return NOTIFY_OK ; }
lib/decompress_bunzip2.c +1 -1
@@ -384,7 +384,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 );
mm/memcontrol.c +1 -1
@@ -1798,7 +1798,7 @@ static void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,return ;case OOM_SCAN_OK :break ; - }; + } points =oom_badness (task, memcg,NULL , totalpages);if (points > chosen_points) {if (chosen)
mm/oom_kill.c +1 -1
@@ -317,7 +317,7 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,return (struct task_struct *)(-1UL );case OOM_SCAN_OK :break ; - }; + } points =oom_badness (p,NULL , nodemask, totalpages);if (points > chosen_points) { chosen = p;
net/sunrpc/auth_gss/auth_gss.c +1 -1
@@ -484,7 +484,7 @@ gss_alloc_msg(struct gss_auth *gss_auth,gss_encode_v0_msg (gss_msg);default :gss_encode_v1_msg (gss_msg, service_name, gss_auth->target_name); - }; + }return gss_msg; }
scripts/conmakehash.c +2 -2
@@ -262,7 +262,7 @@ u8 dfont_unicount[%d] = \n\ {printf ("%3d" , unicount[i]);if ( i == fontlen-1 ) -printf ("\n};\n" ); +printf ("\n}\n" );else if ( i %8 ==7 )printf (",\n\t" );else
@@ -282,7 +282,7 @@ u8 dfont_unicount[%d] = \n\ }printf ("0x%04x" , unitable[fp0][nent++]);if ( i == nuni-1 ) -printf ("\n};\n" ); +printf ("\n}\n" );else if ( i %8 ==7 )printf (",\n\t" );else
scripts/dtc/fdtdump.c +1 -1
@@ -115,7 +115,7 @@ static void dump_blob(void *blob)if (tag ==FDT_END_NODE ) { depth--; -printf ("%*s};\n" , depth * shift,"" ); +printf ("%*s}\n" , depth * shift,"" );continue ; }
security/apparmor/path.c +1 -1
@@ -102,7 +102,7 @@ static int d_namespace_path(struct path *path, char *buf, int buflen, error =PTR_ERR (res); *name = buf; goto out; - }; + } }else if (!our_mnt (path->mnt)) connected =0 ;
security/selinux/hooks.c +1 -1
@@ -1044,7 +1044,7 @@ static void selinux_write_opts(struct seq_file *m,default :BUG ();return ; - }; + }/* we need a comma before each option */ seq_putc (m,',' );seq_puts (m, prefix);
sound/oss/sb_ess.c +1 -1
@@ -1544,7 +1544,7 @@ static int ess_has_rec_mixer (int submodel)return 1 ;default :return 0 ; - }; + } };#ifdef FKS_LOGGING
sound/pci/au88x0/au88x0_pcm.c +1 -1
@@ -671,7 +671,7 @@ static int snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)return err;break ;#endif - }; + }if (VORTEX_PCM_TYPE (pcm) ==VORTEX_PCM_SPDIF ) {for (i =0 ; i <ARRAY_SIZE (snd_vortex_mixer_spdif); i++) {
sound/soc/atmel/atmel_ssc_dai.c +1 -1
@@ -777,7 +777,7 @@ static int asoc_ssc_init(struct device *dev)if (ret) {dev_err (dev,"Could not register PCM: %d\n" , ret); goto err_unregister_dai; - }; + }return 0 ;
sound/soc/codecs/ak4641.c +1 -1
@@ -328,7 +328,7 @@ static int ak4641_i2s_hw_params(struct snd_pcm_substream *substream,if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { ak4641->playback_fs = rate;ak4641_set_deemph (codec); - }; + }return 0 ; }
sound/soc/codecs/mc13783.c +1 -1
@@ -382,7 +382,7 @@ static int mc13783_set_tdm_slot_dac(struct snd_soc_dai *dai,break ;default :
Lines of this file are not shown. View the raw message.
tools/power/cpupower/utils/cpupower-info.c +1 -1
Lines of this file are not shown. View the raw message.
tools/power/cpupower/utils/cpupower-set.c +1 -1
Lines of this file are not shown. View the raw message.
tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c +1 -1
Lines of this file are not shown. View the raw message.
tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c +3 -3
Lines of this file are not shown. View the raw message.
tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c +1 -1
Lines of this file are not shown. View the raw message.
tools/power/cpupower/utils/idle_monitor/nhm_idle.c +1 -1
Lines of this file are not shown. View the raw message.
tools/power/cpupower/utils/idle_monitor/snb_idle.c +1 -1
Lines of this file are not shown. View the raw message.
tools/virtio/virtio-trace/trace-agent-ctl.c +1 -1
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Bjorn Helgaas
maintainerRe: remove unneeded semicolons
Thanks, Joe. I picked up the drivers/pci changes below and will merge them in the v3.13 merge window if nobody else does it first.
Bjorn
drivers/pci/proc.c +0 -0
@@ -222,7 +222,7 @@ static long proc_bus_pci_ioctl(struct file *file,
unsigned int cmd,
default:
ret = -EINVAL;
break;- };
+ }
return ret;
}
drivers/pci/syscall.c +0 -0
@@ -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)Kalle Valo
AppliedQuoted 10 lines · Kalle Valo
From: Fengguang Wu <[email protected]>
drivers/net/wireless/ath/ath10k/core.c:507:2-3: Unneeded semicolon
Removes unneeded semicolon.
Generated by:
coccinelle/misc/semicolon.cocciSigned-off-by Fengguang Wu <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Applied.
Signature · 1 line
Kalle Valo