Remove unnecessary semicolons
Subsystems (66)
PATCH 10/62 arch/um/drivers/net_kern.c: Remove unnecessary semicolons
In reply to Joe Perches--- arch/um/drivers/net_kern.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/um/drivers/net_kern.c +1 -1
@@ -533,7 +533,7 @@ static int eth_parse(char *str, int *index_out, char **str_out, char **error_out) {char *end; -int n, err = -EINVAL ;; +int n, err = -EINVAL ; n =simple_strtoul (str, &end,0 );if (end == str) {
Signature · 8 lines
1.6.3.1.10.g659a0.dirty ------------------------------------------------------------------------------ _______________________________________________ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
PATCH 18/62 drivers/hwmon/sht15.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/hwmon/sht15.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/hwmon/sht15.c +1 -1
@@ -257,7 +257,7 @@ static inline int sht15_update_single_val(struct sht15_data *data, (data->flag =SHT15_READING_NOTHING ), msecs_to_jiffies(timeout_msecs));if (ret =0 ) {/* timeout occurred */ -disable_irq_nosync (gpio_to_irq (data->pdata->gpio_data));; +disable_irq_nosync (gpio_to_irq (data->pdata->gpio_data));sht15_connection_reset (data);return -ETIME ; }
Signature · 7 lines
1.6.3.1.10.g659a0.dirty _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
PATCH 27/62 drivers/net/wireless/ath/ath9k: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/net/wireless/ath/ath9k/eeprom.c | 2 -- drivers/net/wireless/ath/ath9k/hw.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath9k/eeprom.c +0 -2
@@ -2516,10 +2516,8 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah, targetPowerCck.tPow2x[1 ]; ratesArray[rate5_5s] = ratesArray[rate5_5l] = targetPowerCck.tPow2x[2 ]; - ; ratesArray[rate11s] = ratesArray[rate11l] = targetPowerCck.tPow2x[3 ]; - ; }if (IS_CHAN_HT40 (chan)) {for (i =0 ; i <ARRAY_SIZE (targetPowerHt40.tPow2x); i++) {
drivers/net/wireless/ath/ath9k/hw.c +1 -1
@@ -2345,7 +2345,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,ath9k_hw_init_bb (ah, chan);if (!ath9k_hw_init_cal (ah, chan)) -return -EIO ;; +return -EIO ; rx_chainmask = ah->rxchainmask;if ((rx_chainmask ==0x5 ) || (rx_chainmask ==0x3 )) {
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 45/62 drivers/spi: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/spi/omap_uwire.c | 2 +- drivers/spi/spi_s3c24xx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/spi/omap_uwire.c +1 -1
@@ -213,7 +213,7 @@ static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t)unsigned bits = ust->bits_per_word;unsigned bytes;u16 val, w; -int status =0 ;; +int status =0 ;if (!t->tx_buf && !t->rx_buf)return 0 ;
drivers/spi/spi_s3c24xx.c +1 -1
@@ -385,7 +385,7 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev) err_no_iores: err_no_pdata: -spi_master_put (hw->master);; +spi_master_put (hw->master); err_nomem:return err;
Signature · 4 lines
1.6.3.1.10.g659a0.dirty ------------------------------------------------------------------------------
PATCH 50/62 drivers/video/imxfb.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/video/imxfb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/video/imxfb.c +1 -1
@@ -677,7 +677,7 @@ static int __init imxfb_probe(struct platform_device *pdev) fbi->clk =clk_get (&pdev->dev,NULL );if (IS_ERR (fbi->clk)) { - ret =PTR_ERR (fbi->clk);; + ret =PTR_ERR (fbi->clk);dev_err (&pdev->dev,"unable to get clock: %d\n" , ret); goto failed_getclock; }
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 53/62 drivers/xen/balloon.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/xen/balloon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/xen/balloon.c +1 -1
@@ -214,7 +214,7 @@ static int increase_reservation(unsigned long nr_pages) page =balloon_first_page ();for (i =0 ; i < nr_pages; i++) {BUG_ON (page ==NULL ); - frame_list[i] =page_to_pfn (page);; + frame_list[i] =page_to_pfn (page); page =balloon_next_page (page); }
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 54/62 fs/autofs/dirhash.c: Remove unnecessary semicolons
In reply to Joe Perches--- fs/autofs/dirhash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/autofs/dirhash.c +1 -1
@@ -90,7 +90,7 @@ struct autofs_dir_ent *autofs_expire(struct super_block *sb,DPRINTK (("autofs: not expirable (not a mounted directory): %s\n" , ent->name));continue ; } -while (d_mountpoint (path.dentry) &&follow_down (&path)); +while (d_mountpoint (path.dentry) &&follow_down (&path)) ; umount_ok =may_umount (path.mnt);path_put (&path);
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 55/62 fs/btrfs/tree-log.c: Remove unnecessary semicolons
In reply to Joe Perches--- fs/btrfs/tree-log.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/btrfs/tree-log.c +1 -1
@@ -2605,7 +2605,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, extent); cs =btrfs_file_extent_offset (src, extent); cl =btrfs_file_extent_num_bytes (src, - extent);; + extent);if (btrfs_file_extent_compression (src, extent)) { cs =0 ;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 62/62 sound: Remove unnecessary semicolons
In reply to Joe Perches--- sound/oss/sys_timer.c | 3 --- sound/soc/codecs/wm9081.c | 2 +- sound/soc/pxa/pxa-ssp.c | 2 +- sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-)
sound/oss/sys_timer.c +0 -3
@@ -100,9 +100,6 @@ def_tmr_open(int dev, int mode) curr_tempo =60 ; curr_timebase =100 ; opened =1 ; - - ; - { def_tmr.expires = (1 ) + jiffies;add_timer (&def_tmr);
sound/soc/codecs/wm9081.c +1 -1
@@ -1079,7 +1079,7 @@ static int wm9081_hw_params(struct snd_pcm_substream *substream, - wm9081->fs);for (i =1 ; i <ARRAY_SIZE (clk_sys_rates); i++) { cur_val =abs ((wm9081->sysclk_rate / - clk_sys_rates[i].ratio) - wm9081->fs);; + clk_sys_rates[i].ratio) - wm9081->fs);if (cur_val < best_val) { best = i; best_val = cur_val;
sound/soc/pxa/pxa-ssp.c +1 -1
@@ -351,7 +351,7 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai,do_div (tmp, freq_out); val = tmp; - val = (val <<16 ) |64 ;; + val = (val <<16 ) |64 ;ssp_write_reg (ssp,SSACDD , val); ssacd |= (0x6 <<4 );
sound/soc/s3c24xx/s3c24xx_uda134x.c +1 -1
@@ -67,7 +67,7 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream) {int ret =0 ;#ifdef ENFORCE_RATES -struct snd_pcm_runtime *runtime = substream->runtime;; +struct snd_pcm_runtime *runtime = substream->runtime;#endif mutex_lock (&clk_lock);
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 2/62 arch/ia64: Remove unnecessary semicolons
In reply to Joe Perches--- arch/ia64/kernel/esi.c | 2 +- arch/ia64/kvm/process.c | 6 +++--- arch/ia64/kvm/vcpu.c | 2 +- arch/ia64/kvm/vtlb.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)
arch/ia64/kernel/esi.c +1 -1
@@ -65,7 +65,7 @@ static int __init esi_init (void) }if (!esi) -return -ENODEV ;; +return -ENODEV ; systab =__va (esi);
arch/ia64/kvm/process.c +3 -3
@@ -130,7 +130,7 @@ static void collect_interruption(struct kvm_vcpu *vcpu)if (vdcr &IA64_DCR_PP ) { vpsr |=IA64_PSR_PP ; }else { - vpsr &= ~IA64_PSR_PP ;; + vpsr &= ~IA64_PSR_PP ; }vcpu_set_psr (vcpu, vpsr);
@@ -594,11 +594,11 @@ static void set_pal_call_data(struct kvm_vcpu *vcpu) p->u.pal_data.gr30 =vcpu_get_gr (vcpu,30 );break ;case PAL_BRAND_INFO : - p->u.pal_data.gr29 = gr29;; + p->u.pal_data.gr29 = gr29; p->u.pal_data.gr30 =kvm_trans_pal_call_args (vcpu, gr30);break ;default : - p->u.pal_data.gr29 = gr29;; + p->u.pal_data.gr29 = gr29; p->u.pal_data.gr30 =vcpu_get_gr (vcpu,30 ); } p->u.pal_data.gr28 = gr28;
arch/ia64/kvm/vcpu.c +1 -1
@@ -406,7 +406,7 @@ void getreg(unsigned long regnum, unsigned long *val,* Now look at registers in [0-31] range and init correct UNAT */ addr = (unsigned long )regs; - unat = ®s->eml_unat;; + unat = ®s->eml_unat; addr += gr_info[regnum];
arch/ia64/kvm/vtlb.c +2 -2
@@ -135,7 +135,7 @@ struct thash_data *__vtr_lookup(struct kvm_vcpu *vcpu, u64 va, int type)u64 rid; rid =vcpu_get_rr (vcpu, va); - rid = rid &RR_RID_MASK ;; + rid = rid &RR_RID_MASK ;if (type ==D_TLB ) {if (vcpu_quick_region_check (vcpu->arch.dtr_regions, va)) { for (trp = (struct thash_data *)&vcpu->arch.dtrs, i = 0;
@@ -518,7 +518,7 @@ struct thash_data *vtlb_lookup(struct kvm_vcpu *v, u64 va, int is_data)struct thash_cb *hcb = &v->arch.vtlb; - cch =__vtr_lookup (v, va, is_data);; + cch =__vtr_lookup (v, va, is_data);if (cch)return cch;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 7/62 arch/s390/kvm/interrupt.c: Remove unnecessary semicolons
In reply to Joe Perches--- arch/s390/kvm/interrupt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/s390/kvm/interrupt.c +1 -1
@@ -484,7 +484,7 @@ int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code)if (!inti)return -ENOMEM ; - inti->type =KVM_S390_PROGRAM_INT ;; + inti->type =KVM_S390_PROGRAM_INT ; inti->pgm.code = code;VCPU_EVENT (vcpu,3 ,"inject: program check %d (from kernel)" , code);
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 12/62 drivers/ata: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/ata/pata_octeon_cf.c | 2 +- drivers/ata/sata_inic162x.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/ata/pata_octeon_cf.c +1 -1
@@ -213,7 +213,7 @@ static void octeon_cf_set_dmamode(struct ata_port *ap, struct ata_device *dev)* This is tI, C.F. spec. says 0, but Sony CF card requires * more, we use 20 nS. */ - dma_tim.s.dmack_s =ns_to_tim_reg (tim_mult,20 );; + dma_tim.s.dmack_s =ns_to_tim_reg (tim_mult,20 ); dma_tim.s.dmack_h =ns_to_tim_reg (tim_mult, dma_ackh); dma_tim.s.dmarq = dma_arq;
drivers/ata/sata_inic162x.c +1 -1
@@ -405,7 +405,7 @@ static irqreturn_t inic_interrupt(int irq, void *dev_instance)struct ata_host *host = dev_instance;struct inic_host_priv *hpriv = host->private_data;u16 host_irq_stat; -int i, handled =0 ;; +int i, handled =0 ; host_irq_stat =readw (hpriv->mmio_base +HOST_IRQ_STAT );
Signature · 1 line
1.6.3.1.10.g659a0.dirty
cover Remove unnecessary semicolons
Found by script
#! /bin/bash
from=";\s*;\s*\n"
to=";\n"
for file in $(grep -rP --include=*.[ch] -li $from *) ; do
perl -i -e \
"local $/; while(<>) { s/$from/$to/g; print; }" $filedone
Some false positives removed manually
Joe Perches (62):
arch/arm: Remove unnecessary semicolons
arch/ia64: Remove unnecessary semicolons arch/m68knommu/kernel/time.c: Remove unnecessary semicolons arch/mips/kernel/vpe.c: Remove unnecessary semicolons arch/powerpc: Remove unnecessary semicolons arch/s390/hypfs/inode.c: Remove unnecessary semicolons arch/s390/kvm/interrupt.c: Remove unnecessary semicolons arch/sh/boards/mach-se/7206/io.c: Remove unnecessary semicolons arch/sparc/kernel/irq_64.c: Remove unnecessary semicolons arch/um/drivers/net_kern.c: Remove unnecessary semicolons arch/x86/kernel/ds.c: Remove unnecessary semicolons drivers/ata: Remove unnecessary semicolons
drivers/block: Remove unnecessary semicolons drivers/char/epca.c: Remove unnecessary semicolons drivers/dma/fsldma.c: Remove unnecessary semicolons drivers/dma: Remove unnecessary semicolons drivers/gpu/drm: Remove unnecessary semicolons drivers/hwmon/sht15.c: Remove unnecessary semicolons drivers/ide: Remove unnecessary semicolons drivers/isdn/capi/capiutil.c: Remove unnecessary semicolons drivers/macintosh/rack-meter.c: Remove unnecessary semicolons drivers/media/video/cx18/cx18-fileops.c: Remove unnecessary semicolons drivers/media/video/ivtv/ivtv-driver.c: Remove unnecessary semicolons drivers/media: Remove unnecessary semicolons drivers/mfd/twl4030-irq.c: Remove unnecessary semicolons drivers/mmc/host/imxmmc.c: Remove unnecessary semicolons drivers/net/wireless/ath/ath9k: Remove unnecessary semicolons drivers/net/bnx2x_link.c: Remove unnecessary semicolons drivers/net/igb/igb_main.c: Remove unnecessary semicolons drivers/net/qlge/qlge_main.c: Remove unnecessary semicolons drivers/net/skfp: Remove unnecessary semicolons drivers/net/skge.c: Remove unnecessary semicolons drivers/net/sky2.c: Remove unnecessary semicolons drivers/net: Remove unnecessary semicolons drivers/pci/pcie/aer/ecrc.c: Remove unnecessary semicolons drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolons drivers/regulator/pcf50633-regulator.c: Remove unnecessary semicolons drivers/rtc/rtc-omap.c: Remove unnecessary semicolons drivers/s390/block/dasd_eckd.c: Remove unnecessary semicolons drivers/s390/net/netiucv.c: Remove unnecessary semicolons drivers/s390/scsi/zfcp_scsi.c: Remove unnecessary semicolons drivers/scsi/bnx2i/bnx2i_hwi.c: Remove unnecessary semicolons include/scsi/fc/fc_fc2.h: Remove unnecessary semicolons drivers/scsi/lpfc/lpfc_ct.c: Remove unnecessary semicolons drivers/spi: Remove unnecessary semicolons drivers/staging: Remove unnecessary semicolons drivers/usb: Remove unnecessary semicolons drivers/uwb/i1480/i1480u-wlp/netdev.c: Remove unnecessary semicolons drivers/video/cfbcopyarea.c: Remove unnecessary semicolons drivers/video/imxfb.c: Remove unnecessary semicolons drivers/video/s3c2410fb.c: Remove unnecessary semicolons drivers/watchdog/bcm47xx_wdt.c: Remove unnecessary semicolons drivers/xen/balloon.c: Remove unnecessary semicolons fs/autofs/dirhash.c: Remove unnecessary semicolons fs/btrfs/tree-log.c: Remove unnecessary semicolons fs/cifs/cifs_dfs_ref.c: Remove unnecessary semicolons fs/ext4/mballoc.c: Remove unnecessary semicolons fs/nfs/callback_xdr.c: Remove unnecessary semicolons fs/ocfs2/quota_global.c: Remove unnecessary semicolons kernel/trace/trace_hw_branches.c: Remove unnecessary semicolons net/wireless/wext-compat.c: Remove unnecessary semicolons
sound: Remove unnecessary semicolons
arch/arm/mach-at91/at91cap9_devices.c | 2 +- arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- arch/arm/mach-w90x900/w90p910.c | 2 +- arch/arm/plat-mxc/irq.c | 2 +- arch/ia64/kernel/esi.c | 2 +- arch/ia64/kvm/process.c | 6 +++--- arch/ia64/kvm/vcpu.c | 2 +- arch/ia64/kvm/vtlb.c | 4 ++-- arch/m68knommu/kernel/time.c | 2 +- arch/mips/kernel/vpe.c | 2 +- arch/powerpc/mm/tlb_hash64.c | 2 +- arch/powerpc/oprofile/cell/vma_map.c | 2 +- arch/powerpc/platforms/powermac/cpufreq_64.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 2 +- arch/powerpc/platforms/ps3/system-bus.c | 1 - arch/powerpc/sysdev/fsl_rio.c | 2 +- arch/powerpc/sysdev/ppc4xx_pci.c | 4 ++-- arch/s390/hypfs/inode.c | 2 +- arch/s390/kvm/interrupt.c | 2 +- arch/sh/boards/mach-se/7206/io.c | 2 +- arch/sparc/kernel/irq_64.c | 2 +- arch/um/drivers/net_kern.c | 2 +- arch/x86/kernel/ds.c | 2 +- drivers/ata/pata_octeon_cf.c | 2 +- drivers/ata/sata_inic162x.c | 2 +- drivers/block/DAC960.c | 4 ++-- drivers/block/swim3.c | 2 +- drivers/char/epca.c | 2 +- drivers/dma/dmatest.c | 2 +- drivers/dma/fsldma.c | 2 +- drivers/dma/mv_xor.c | 2 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/radeon/r300.c | 4 ++-- drivers/hwmon/sht15.c | 2 +- drivers/ide/ide-probe.c | 2 +- drivers/ide/umc8672.c | 4 ++-- drivers/isdn/capi/capiutil.c | 2 +- drivers/macintosh/rack-meter.c | 2 +- drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 2 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 2 +- drivers/media/dvb/frontends/cx24123.c | 2 +- drivers/media/dvb/frontends/dib0070.c | 2 +- drivers/media/dvb/frontends/stv0900_sw.c | 2 +- drivers/media/video/cx18/cx18-fileops.c | 2 +- drivers/media/video/cx231xx/cx231xx-video.c | 4 ++-- drivers/media/video/cx23885/cx23885.h | 2 +- drivers/media/video/ivtv/ivtv-driver.c | 2 +- drivers/mfd/twl4030-irq.c | 2 +- drivers/mmc/host/imxmmc.c | 2 +- drivers/net/arcnet/arc-rawmode.c | 1 - drivers/net/arcnet/capmode.c | 1 - drivers/net/bnx2x_link.c | 2 +- drivers/net/gianfar_ethtool.c | 2 +- drivers/net/ibm_newemac/core.c | 8 ++++---- drivers/net/igb/igb_main.c | 4 ++-- drivers/net/ll_temac_main.c | 2 +- drivers/net/ni52.c | 4 ++-- drivers/net/qlge/qlge_main.c | 4 ++-- drivers/net/skfp/pcmplc.c | 2 +- drivers/net/skfp/pmf.c | 8 ++++---- drivers/net/skge.c | 2 +- drivers/net/sky2.c | 2 +- drivers/net/vxge/vxge-config.h | 2 +- drivers/net/vxge/vxge-main.c | 2 +- drivers/net/wireless/ath/ath9k/eeprom.c | 2 -- drivers/net/wireless/ath/ath9k/hw.c | 2 +- drivers/net/wireless/iwmc3200wifi/rx.c | 8 ++++---- drivers/pci/pcie/aer/ecrc.c | 2 +- drivers/pcmcia/pcmcia_resource.c | 2 +- drivers/regulator/pcf50633-regulator.c | 2 +- drivers/rtc/rtc-omap.c | 2 +- drivers/s390/block/dasd_eckd.c | 2 +- drivers/s390/net/netiucv.c | 2 +- drivers/s390/scsi/zfcp_scsi.c | 2 +- drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- drivers/scsi/lpfc/lpfc_ct.c | 2 +- drivers/spi/omap_uwire.c | 2 +- drivers/spi/spi_s3c24xx.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- drivers/staging/comedi/drivers/comedi_bond.c | 2 +- drivers/staging/go7007/go7007-driver.c | 2 +- drivers/staging/otus/80211core/cmmsta.c | 2 +- drivers/staging/otus/hal/hpmain.c | 2 +- drivers/staging/rt2860/common/cmm_data_2860.c | 8 ++++---- drivers/staging/rt2860/rt_linux.c | 2 +- drivers/staging/rt2860/rtmp.h | 3 +-- drivers/staging/rt2860/sta/aironet.c | 2 +- drivers/staging/rtl8187se/r8185b_init.c | 2 +- drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 2 +- drivers/staging/rtl8192su/r8192U_core.c | 6 +++--- drivers/staging/rtl8192su/r819xU_phy.c | 2 +- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/iwctl.c | 2 +- drivers/staging/vt6655/wpa2.c | 4 ++-- drivers/usb/class/cdc-wdm.c | 2 -- drivers/usb/serial/spcp8x5.c | 2 +- drivers/uwb/i1480/i1480u-wlp/netdev.c | 2 +- drivers/video/cfbcopyarea.c | 2 +- drivers/video/imxfb.c | 2 +- drivers/video/s3c2410fb.c | 2 +- drivers/watchdog/bcm47xx_wdt.c | 2 +- drivers/xen/balloon.c | 2 +- fs/autofs/dirhash.c | 2 +- fs/btrfs/tree-log.c | 2 +- fs/cifs/cifs_dfs_ref.c | 2 +- fs/ext4/mballoc.c | 2 +- fs/nfs/callback_xdr.c | 2 +- fs/ocfs2/quota_global.c | 2 +- include/scsi/fc/fc_fc2.h | 3 +-- kernel/trace/trace_hw_branches.c | 2 +- net/wireless/wext-compat.c | 2 +- sound/oss/sys_timer.c | 3 --- sound/soc/codecs/wm9081.c | 2 +- sound/soc/pxa/pxa-ssp.c | 2 +- sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 +- 119 files changed, 139 insertions(+), 151 deletions(-)
PATCH 19/62 drivers/ide: Remove unnecessary semicolons
--- drivers/ide/ide-probe.c | 2 +- drivers/ide/umc8672.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/ide/ide-probe.c +1 -1
@@ -1201,7 +1201,7 @@ static int ide_find_port_slot(const struct ide_port_info *d) {int idx = -ENOENT ;u8 bootable = (d && (d->host_flags &IDE_HFLAG_NON_BOOTABLE )) ?0 :1 ; -u8 i = (d && (d->host_flags &IDE_HFLAG_QD_2ND_PORT )) ?1 :0 ;; +u8 i = (d && (d->host_flags &IDE_HFLAG_QD_2ND_PORT )) ?1 :0 ;/* * Claim an unassigned slot.
drivers/ide/umc8672.c +2 -2
@@ -170,9 +170,9 @@ static int __init umc8672_init(void) goto out;if (umc8672_probe () ==0 ) -return 0 ;; +return 0 ; out: -return -ENODEV ;; +return -ENODEV ; }module_init (umc8672_init);
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 22/62 drivers/media/video/cx18/cx18-fileops.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/media/video/cx18/cx18-fileops.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/media/video/cx18/cx18-fileops.c +1 -1
@@ -690,7 +690,7 @@ int cx18_v4l2_open(struct file *filp)int res;struct video_device *video_dev =video_devdata (filp);struct cx18_stream *s =video_get_drvdata (video_dev); -struct cx18 *cx = s->cx;; +struct cx18 *cx = s->cx;mutex_lock (&cx->serialize_lock);if (cx18_init_on_first_open (cx)) {
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 23/62 drivers/media/video/ivtv/ivtv-driver.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/media/video/ivtv/ivtv-driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/media/video/ivtv/ivtv-driver.c +1 -1
@@ -218,7 +218,7 @@ MODULE_PARM_DESC(ivtv_yuv_mode, "\t\t\tDefault: 0 (interlaced)");MODULE_PARM_DESC (ivtv_yuv_threshold,"If ivtv_yuv_mode is 2 (auto) then playback content as\n\t\tprogressive if src height <= ivtv_yuvthreshold\n" -"\t\t\tDefault: 480" );; +"\t\t\tDefault: 480" );MODULE_PARM_DESC (enc_mpg_buffers,"Encoder MPG Buffers (in MB)\n" "\t\t\tDefault: " __stringify(IVTV_DEFAULT_ENC_MPG_BUFFERS ));
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 24/62 drivers/media: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 2 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 2 +- drivers/media/dvb/frontends/cx24123.c | 2 +- drivers/media/dvb/frontends/dib0070.c | 2 +- drivers/media/dvb/frontends/stv0900_sw.c | 2 +- drivers/media/video/cx231xx/cx231xx-video.c | 4 ++-- drivers/media/video/cx23885/cx23885.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-)
drivers/media/dvb/b2c2/flexcop-fe-tuner.c +1 -1
@@ -410,7 +410,7 @@ static int skystar2_rev28_attach(struct flexcop_device *fc,if (!fc->fe)return 0 ; - i2c_tuner =cx24123_get_tuner_i2c_adapter (fc->fe);; + i2c_tuner =cx24123_get_tuner_i2c_adapter (fc->fe);if (!i2c_tuner)return 0 ;
drivers/media/dvb/dvb-usb/dib0700_devices.c +1 -1
@@ -310,7 +310,7 @@ static int stk7700d_tuner_attach(struct dvb_usb_adapter *adap)struct i2c_adapter *tun_i2c; tun_i2c =dib7000p_get_i2c_master (adap->fe,DIBX000_I2C_INTERFACE_TUNER ,1 );return dvb_attach (mt2266_attach, adap->fe, tun_i2c, - &stk7700d_mt2266_config[adap->id]) ==NULL ? -ENODEV :0 ;; + &stk7700d_mt2266_config[adap->id]) ==NULL ? -ENODEV :0 ; }/* STK7700-PH: Digital/Analog Hybrid Tuner, e.h. Cinergy HT USB HE */
drivers/media/dvb/frontends/cx24123.c +1 -1
@@ -458,7 +458,7 @@ static int cx24123_set_symbolrate(struct cx24123_state *state, u32 srate)/* check if symbol rate is within limits */ if ((srate > state->frontend.ops.info.symbol_rate_max) || (srate < state->frontend.ops.info.symbol_rate_min)) -return -EOPNOTSUPP ;; +return -EOPNOTSUPP ;/* choose the sampling rate high enough for the required operation, while optimizing the power consumed by the demodulator */
drivers/media/dvb/frontends/dib0070.c +1 -1
@@ -167,7 +167,7 @@ static int dib0070_tune_digital(struct dvb_frontend *fe, struct dvb_frontend_parbreak ;case BAND_SBAND :LO4_SET_VCO_HFDIV (lo4,0 ,0 ); -LO4_SET_CTRIM (lo4,1 );; +LO4_SET_CTRIM (lo4,1 ); c =1 ;break ;case BAND_UHF :
drivers/media/dvb/frontends/stv0900_sw.c +1 -1
@@ -1721,7 +1721,7 @@ static enum fe_stv0900_signal_type stv0900_dvbs1_acq_workaround(struct dvb_fronts32 srate, demod_timeout, fec_timeout, freq1, freq0; -enum fe_stv0900_signal_type signal_type =STV0900_NODATA ;; +enum fe_stv0900_signal_type signal_type =STV0900_NODATA ;switch (demod) {case STV0900_DEMOD_1 :
drivers/media/video/cx231xx/cx231xx-video.c +2 -2
@@ -923,8 +923,8 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, f->fmt.pix.width = dev->width; f->fmt.pix.height = dev->height; - f->fmt.pix.pixelformat = dev->format->fourcc;; - f->fmt.pix.bytesperline = (dev->width * dev->format->depth +7 ) >>3 ;; + f->fmt.pix.pixelformat = dev->format->fourcc; + f->fmt.pix.bytesperline = (dev->width * dev->format->depth +7 ) >>3 ; f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * dev->height; f->fmt.pix.colorspace =V4L2_COLORSPACE_SMPTE170M ;
drivers/media/video/cx23885/cx23885.h +1 -1
@@ -391,7 +391,7 @@ struct sram_channel {u32 cmds_start;u32 ctrl_start;u32 cdt; -u32 fifo_start;; +u32 fifo_start;u32 fifo_size;u32 ptr1_reg;u32 ptr2_reg;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 28/62 drivers/net/bnx2x_link.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/net/bnx2x_link.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/bnx2x_link.c +1 -1
@@ -2390,7 +2390,7 @@ static u8 bnx2x_read_sfp_module_eeprom(struct link_params *params, u16 addr, MDIO_PMA_REG_8726_TWO_WIRE_CTRL, &val);if ((val &MDIO_PMA_REG_8726_TWO_WIRE_CTRL_STATUS_MASK ) ==MDIO_PMA_REG_8726_TWO_WIRE_STATUS_IDLE ) -return 0 ;; +return 0 ;msleep (1 ); }return -EINVAL ;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 29/62 drivers/net/igb/igb_main.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/net/igb/igb_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/igb/igb_main.c +2 -2
@@ -3901,7 +3901,7 @@ static int igb_set_vf_multicasts(struct igb_adapter *adapter,/* VFs are limited to using the MTA hash table for their multicast * addresses */ for (i =0 ; i < n; i++) - vf_data->vf_mc_hashes[i] = hash_list[i];; + vf_data->vf_mc_hashes[i] = hash_list[i];/* Flush and reset the mta with the new values */ igb_set_multi (adapter->netdev);
@@ -5447,7 +5447,7 @@ static inline void igb_set_rah_pool(struct e1000_hw *hw, int pool, int entry) reg_data =rd32 (E1000_RAH (entry)); reg_data &= ~E1000_RAH_POOL_MASK ; - reg_data |=E1000_RAH_POOL_1 << pool;; + reg_data |=E1000_RAH_POOL_1 << pool;wr32 (E1000_RAH (entry), reg_data); }
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 30/62 drivers/net/qlge/qlge_main.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/net/qlge/qlge_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/qlge/qlge_main.c +2 -2
@@ -2607,7 +2607,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)FLAGS_LI ;/* Load irq delay values */ if (rx_ring->lbq_len) { cqicb->flags |=FLAGS_LL ;/* Load lbq values */ - tmp = (u64 )rx_ring->lbq_base_dma;; + tmp = (u64 )rx_ring->lbq_base_dma; base_indirect_ptr = (__le64 *) rx_ring->lbq_base_indirect; page_entries =0 ; do {
@@ -2631,7 +2631,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring) }if (rx_ring->sbq_len) { cqicb->flags |=FLAGS_LS ;/* Load sbq values */ - tmp = (u64 )rx_ring->sbq_base_dma;; + tmp = (u64 )rx_ring->sbq_base_dma; base_indirect_ptr = (__le64 *) rx_ring->sbq_base_indirect; page_entries =0 ; do {
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 31/62 drivers/net/skfp: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/net/skfp/pcmplc.c | 2 +- drivers/net/skfp/pmf.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/skfp/pcmplc.c +1 -1
@@ -960,7 +960,7 @@ static void pcm_fsm(struct s_smc *smc, struct s_phy *phy, int cmd)/*PC88b*/ if (!phy->cf_join) { phy->cf_join = TRUE ; -queue_event (smc,EVENT_CFM ,CF_JOIN +np) ; ; +queue_event (smc,EVENT_CFM ,CF_JOIN +np) ; }if (cmd ==PC_JOIN )GO_STATE (PC8_ACTIVE ) ;
drivers/net/skfp/pmf.c +4 -4
@@ -807,9 +807,9 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para, mib_p->fddiPORTLerFlag ; sp->p4050_pad =0 ; sp->p4050_cutoff = - mib_p->fddiPORTLer_Cutoff ; ; + mib_p->fddiPORTLer_Cutoff ; sp->p4050_alarm = - mib_p->fddiPORTLer_Alarm ; ; + mib_p->fddiPORTLer_Alarm ; sp->p4050_estimate = mib_p->fddiPORTLer_Estimate ; sp->p4050_reject_ct =
@@ -829,7 +829,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para, sp->p4051_porttype = mib_p->fddiPORTMy_Type ; sp->p4051_connectstate = - mib_p->fddiPORTConnectState ; ; + mib_p->fddiPORTConnectState ; sp->p4051_pc_neighbor = mib_p->fddiPORTNeighborType ; sp->p4051_pc_withhold =
@@ -853,7 +853,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,struct smt_p_4053 *sp ; sp = (struct smt_p_4053 *) to ; sp->p4053_multiple = - mib_p->fddiPORTMultiple_P ; ; + mib_p->fddiPORTMultiple_P ; sp->p4053_availablepaths = mib_p->fddiPORTAvailablePaths ; sp->p4053_currentpath =
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 32/62 drivers/net/skge.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/net/skge.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/skge.c +1 -1
@@ -215,7 +215,7 @@ static void skge_wol_init(struct skge_port *skge)if (skge->wol &WAKE_MAGIC ) ctrl |=WOL_CTL_ENA_PME_ON_MAGIC_PKT |WOL_CTL_ENA_MAGIC_PKT_UNIT ;else - ctrl |=WOL_CTL_DIS_PME_ON_MAGIC_PKT |WOL_CTL_DIS_MAGIC_PKT_UNIT ;; + ctrl |=WOL_CTL_DIS_PME_ON_MAGIC_PKT |WOL_CTL_DIS_MAGIC_PKT_UNIT ; ctrl |=WOL_CTL_DIS_PME_ON_PATTERN |WOL_CTL_DIS_PATTERN_UNIT ;skge_write16 (hw,WOL_REGS (port,WOL_CTRL_STAT ), ctrl);
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 33/62 drivers/net/sky2.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/net/sky2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/sky2.c +1 -1
@@ -749,7 +749,7 @@ static void sky2_wol_init(struct sky2_port *sky2)if (sky2->wol &WAKE_MAGIC ) ctrl |=WOL_CTL_ENA_PME_ON_MAGIC_PKT |WOL_CTL_ENA_MAGIC_PKT_UNIT ;else - ctrl |=WOL_CTL_DIS_PME_ON_MAGIC_PKT |WOL_CTL_DIS_MAGIC_PKT_UNIT ;; + ctrl |=WOL_CTL_DIS_PME_ON_MAGIC_PKT |WOL_CTL_DIS_MAGIC_PKT_UNIT ; ctrl |=WOL_CTL_DIS_PME_ON_PATTERN |WOL_CTL_DIS_PATTERN_UNIT ;sky2_write16 (hw,WOL_REGS (port,WOL_CTRL_STAT ), ctrl);
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 34/62 drivers/net: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/net/arcnet/arc-rawmode.c | 1 - drivers/net/arcnet/capmode.c | 1 - drivers/net/gianfar_ethtool.c | 2 +- drivers/net/ibm_newemac/core.c | 8 ++++---- drivers/net/ll_temac_main.c | 2 +- drivers/net/ni52.c | 4 ++-- drivers/net/vxge/vxge-config.h | 2 +- drivers/net/vxge/vxge-main.c | 2 +- drivers/net/wireless/iwmc3200wifi/rx.c | 8 ++++---- 9 files changed, 14 insertions(+), 16 deletions(-)
drivers/net/arcnet/arc-rawmode.c +0 -1
@@ -123,7 +123,6 @@ static void rx(struct net_device *dev, int bufnum, BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx"); skb->protocol = cpu_to_be16(ETH_P_ARCNET); -; netif_rx(skb); }
drivers/net/arcnet/capmode.c +0 -1
@@ -149,7 +149,6 @@ static void rx(struct net_device *dev, int bufnum, BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx"); skb->protocol = cpu_to_be16(ETH_P_ARCNET); -; netif_rx(skb); }
drivers/net/gianfar_ethtool.c +1 -1
@@ -293,7 +293,7 @@ static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals rxtime =get_ictt_value (priv->rxic); rxcount =get_icft_value (priv->rxic); txtime =get_ictt_value (priv->txic); - txcount =get_icft_value (priv->txic);; + txcount =get_icft_value (priv->txic); cvals->rx_coalesce_usecs =gfar_ticks2usecs (priv, rxtime); cvals->rx_max_coalesced_frames = rxcount;
drivers/net/ibm_newemac/core.c +4 -4
@@ -2557,13 +2557,13 @@ static int __devinit emac_init_config(struct emac_instance *dev)if (emac_read_uint_prop (np,"mdio-device" , &dev->mdio_ph,0 )) dev->mdio_ph =0 ;if (emac_read_uint_prop (np,"zmii-device" , &dev->zmii_ph,0 )) - dev->zmii_ph =0 ;; + dev->zmii_ph =0 ;if (emac_read_uint_prop (np,"zmii-channel" , &dev->zmii_port,0 )) - dev->zmii_port =0xffffffff ;; + dev->zmii_port =0xffffffff ;if (emac_read_uint_prop (np,"rgmii-device" , &dev->rgmii_ph,0 )) - dev->rgmii_ph =0 ;; + dev->rgmii_ph =0 ;if (emac_read_uint_prop (np,"rgmii-channel" , &dev->rgmii_port,0 )) - dev->rgmii_port =0xffffffff ;; + dev->rgmii_port =0xffffffff ;if (emac_read_uint_prop (np,"fifo-entry-size" , &dev->fifo_entry_size,0 )) dev->fifo_entry_size =16 ;if (emac_read_uint_prop (np,"mal-burst-size" , &dev->mal_burst_size,0 ))
drivers/net/ll_temac_main.c +1 -1
@@ -865,7 +865,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match) dcrs =dcr_resource_start (np,0 );if (dcrs ==0 ) {dev_err (&op->dev,"could not get DMA register address\n" ); - goto nodev;; + goto nodev; } lp->sdma_dcrs =dcr_map (np, dcrs,dcr_resource_len (np,0 ));dev_dbg (&op->dev,"DCR base: %x\n" , dcrs);
drivers/net/ni52.c +2 -2
@@ -615,10 +615,10 @@ static int init586(struct net_device *dev)/* addr_len |!src_insert |pre-len |loopback */ writeb (0x2e , &cfg_cmd->adr_len);writeb (0x00 , &cfg_cmd->priority); -writeb (0x60 , &cfg_cmd->ifs);; +writeb (0x60 , &cfg_cmd->ifs);writeb (0x00 , &cfg_cmd->time_low);writeb (0xf2 , &cfg_cmd->time_high); -writeb (0x00 , &cfg_cmd->promisc);; +writeb (0x00 , &cfg_cmd->promisc);if (dev->flags &IFF_ALLMULTI ) {int len = ((char __iomem *)p->iscp - (char __iomem *)ptr -8 ) /6 ;if (num_addrs > len) {
drivers/net/vxge/vxge-config.h +1 -1
@@ -1547,7 +1547,7 @@ void vxge_hw_ring_rxd_1b_info_get( rxd_info->l4_cksum_valid = (u32 )VXGE_HW_RING_RXD_L4_CKSUM_CORRECT_GET (rxdp->control_0); rxd_info->l4_cksum = - (u32 )VXGE_HW_RING_RXD_L4_CKSUM_GET (rxdp->control_0);; + (u32 )VXGE_HW_RING_RXD_L4_CKSUM_GET (rxdp->control_0); rxd_info->frame = (u32 )VXGE_HW_RING_RXD_ETHER_ENCAP_GET (rxdp->control_0); rxd_info->proto =
drivers/net/vxge/vxge-main.c +1 -1
@@ -2341,7 +2341,7 @@ static int vxge_enable_msix(struct vxgedev *vdev)enum vxge_hw_status status;/* 0 - Tx, 1 - Rx */ int tim_msix_id[4 ]; -int alarm_msix_id =0 , msix_intr_vect =0 ;; +int alarm_msix_id =0 , msix_intr_vect =0 ; vdev->intr_cnt =0 ;/* allocate msix vectors */
drivers/net/wireless/iwmc3200wifi/rx.c +4 -4
@@ -779,16 +779,16 @@ static int iwm_mlme_mgt_frame(struct iwm_priv *iwm, u8 *buf, le16_to_cpu(mgt_frame->len));if (ieee80211_is_assoc_req (mgt->frame_control)) { - ie = mgt->u.assoc_req.variable;; + ie = mgt->u.assoc_req.variable; event =IWEVASSOCREQIE ; }else if (ieee80211_is_reassoc_req (mgt->frame_control)) { - ie = mgt->u.reassoc_req.variable;; + ie = mgt->u.reassoc_req.variable; event =IWEVASSOCREQIE ; }else if (ieee80211_is_assoc_resp (mgt->frame_control)) { - ie = mgt->u.assoc_resp.variable;; + ie = mgt->u.assoc_resp.variable; event =IWEVASSOCRESPIE ; }else if (ieee80211_is_reassoc_resp (mgt->frame_control)) { - ie = mgt->u.reassoc_resp.variable;; + ie = mgt->u.reassoc_resp.variable; event =IWEVASSOCRESPIE ; }else {IWM_ERR (iwm,"Unsupported management frame" );
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 1/62 arch/arm: Remove unnecessary semicolons
In reply to Joe Perches--- arch/arm/mach-at91/at91cap9_devices.c | 2 +- arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- arch/arm/mach-w90x900/w90p910.c | 2 +- arch/arm/plat-mxc/irq.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-at91/at91cap9_devices.c +1 -1
@@ -171,7 +171,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)*/ usba_udc_data.pdata.vbus_pin = -EINVAL ; usba_udc_data.pdata.num_ep =ARRAY_SIZE (usba_udc_ep); -memcpy (usba_udc_data.ep, usba_udc_ep,sizeof (usba_udc_ep));; +memcpy (usba_udc_data.ep, usba_udc_ep,sizeof (usba_udc_ep));if (data && data->vbus_pin >0 ) {at91_set_gpio_input (data->vbus_pin,0 );
arch/arm/mach-at91/at91sam9rl_devices.c +1 -1
@@ -99,7 +99,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)*/ usba_udc_data.pdata.vbus_pin = -EINVAL ; usba_udc_data.pdata.num_ep =ARRAY_SIZE (usba_udc_ep); -memcpy (usba_udc_data.ep, usba_udc_ep,sizeof (usba_udc_ep));; +memcpy (usba_udc_data.ep, usba_udc_ep,sizeof (usba_udc_ep));if (data && data->vbus_pin >0 ) {at91_set_gpio_input (data->vbus_pin,0 );
arch/arm/mach-w90x900/w90p910.c +1 -1
@@ -62,7 +62,7 @@ static DEFINE_CLK(atapi, 6); static DEFINE_CLK(emc, 7); static DEFINE_CLK(usbd, 8); static DEFINE_CLK(usbh, 9); -static DEFINE_CLK(g2d, 10);; +static DEFINE_CLK(g2d, 10); static DEFINE_CLK(pwm, 18); static DEFINE_CLK(ps2, 24); static DEFINE_CLK(kpi, 25);
arch/arm/plat-mxc/irq.c +1 -1
@@ -53,7 +53,7 @@ int imx_irq_set_priority(unsigned char irq, unsigned char prio)unsigned int mask =0x0F << irq %8 *4 ;if (irq >=MXC_INTERNAL_IRQS ) -return -EINVAL ;; +return -EINVAL ; temp =__raw_readl (avic_base +AVIC_NIPRIORITY (irq /8 )); temp &= ~mask;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 42/62 drivers/scsi/bnx2i/bnx2i_hwi.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/scsi/bnx2i/bnx2i_hwi.c +1 -1
@@ -1340,7 +1340,7 @@ static int bnx2i_process_login_resp(struct iscsi_session *session, resp_hdr->opcode = login->op_code; resp_hdr->flags = login->response_flags; resp_hdr->max_version = login->version_max; - resp_hdr->active_version = login->version_active;; + resp_hdr->active_version = login->version_active; resp_hdr->hlength =0 ;hton24 (resp_hdr->dlength, login->data_length);
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 43/62 include/scsi/fc/fc_fc2.h: Remove unnecessary semicolons
In reply to Joe Perches--- include/scsi/fc/fc_fc2.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
include/scsi/fc/fc_fc2.h +1 -2
@@ -92,8 +92,7 @@ struct fc_esb {__u8 _esb_resvd[4 ];__u8 esb_service_params[112 ];/* TBD */ __u8 esb_seq_status[8 ];/* sequence statuses, 8 bytes each */ -} __attribute__((packed));; - +} __attribute__((packed));/* * Define expected size for ASSERTs.
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 44/62 drivers/scsi/lpfc/lpfc_ct.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/scsi/lpfc/lpfc_ct.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/scsi/lpfc/lpfc_ct.c +1 -1
@@ -1205,7 +1205,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode, vport->ct_flags &= ~FC_CT_RFF_ID ; CtReq->CommandResponse.bits.CmdRsp =be16_to_cpu (SLI_CTNS_RFF_ID ); - CtReq->un.rff.PortId =cpu_to_be32 (vport->fc_myDID);; + CtReq->un.rff.PortId =cpu_to_be32 (vport->fc_myDID); CtReq->un.rff.fbits =FC4_FEATURE_INIT ; CtReq->un.rff.type_code =FC_FCP_DATA ; cmpl = lpfc_cmpl_ct_cmd_rff_id;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 57/62 fs/ext4/mballoc.c: Remove unnecessary semicolons
In reply to Joe Perches--- fs/ext4/mballoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/ext4/mballoc.c +1 -1
@@ -2525,7 +2525,7 @@ int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group,INIT_LIST_HEAD (&meta_group_info[i]->bb_prealloc_list);init_rwsem (&meta_group_info[i]->alloc_sem); - meta_group_info[i]->bb_free_root.rb_node =NULL ;; + meta_group_info[i]->bb_free_root.rb_node =NULL ;#ifdef DOUBLE_CHECK {
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 58/62 fs/nfs/callback_xdr.c: Remove unnecessary semicolons
In reply to Joe Perches--- fs/nfs/callback_xdr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/nfs/callback_xdr.c +1 -1
@@ -222,7 +222,7 @@ static unsigned decode_sessionid(struct xdr_stream *xdr, p =read_buf (xdr, len);if (unlikely (p ==NULL )) -return htonl (NFS4ERR_RESOURCE );; +return htonl (NFS4ERR_RESOURCE );memcpy (sid->data, p, len);return 0 ;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 3/62 arch/m68knommu/kernel/time.c: Remove unnecessary semicolons
In reply to Joe Perches--- arch/m68knommu/kernel/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/m68knommu/kernel/time.c +1 -1
@@ -69,7 +69,7 @@ static unsigned long read_rtc_mmss(void)if ((year +=1900 ) <1970 ) year +=100 ; -return mktime (year, mon, day, hour, min, sec);; +return mktime (year, mon, day, hour, min, sec); }unsigned long read_persistent_clock (void )
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 4/62 arch/mips/kernel/vpe.c: Remove unnecessary semicolons
In reply to Joe Perches--- arch/mips/kernel/vpe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/mips/kernel/vpe.c +1 -1
@@ -1387,7 +1387,7 @@ static ssize_t store_ntcs(struct device *dev, struct device_attribute *attr,return len; out_einval: -return -EINVAL ;; +return -EINVAL ; }static struct device_attribute vpe_class_attributes[] = {
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 5/62 arch/powerpc: Remove unnecessary semicolons
In reply to Joe Perches--- arch/powerpc/mm/tlb_hash64.c | 2 +- arch/powerpc/oprofile/cell/vma_map.c | 2 +- arch/powerpc/platforms/powermac/cpufreq_64.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 2 +- arch/powerpc/platforms/ps3/system-bus.c | 1 - arch/powerpc/sysdev/fsl_rio.c | 2 +- arch/powerpc/sysdev/ppc4xx_pci.c | 4 ++-- 7 files changed, 7 insertions(+), 8 deletions(-)
arch/powerpc/mm/tlb_hash64.c +1 -1
@@ -72,7 +72,7 @@ void hpte_need_flush(struct mm_struct *mm, unsigned long addr,*/ if (huge) {#ifdef CONFIG_HUGETLB_PAGE - psize =get_slice_psize (mm, addr);; + psize =get_slice_psize (mm, addr);#else BUG (); psize =pte_pagesize_index (mm, addr, pte);/* shutup gcc */
arch/powerpc/oprofile/cell/vma_map.c +1 -1
@@ -185,7 +185,7 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu, goto fail;if (shdr_str.sh_type !=SHT_STRTAB ) - goto fail;; + goto fail;for (j =0 ; j < shdr.sh_size /sizeof (sym); j++) { if (copy_from_user(&sym, spu_elf_start +
arch/powerpc/platforms/powermac/cpufreq_64.c +1 -1
@@ -251,7 +251,7 @@ static void g5_pfunc_switch_volt(int speed_mode)static struct pmf_function *pfunc_cpu_setfreq_high;static struct pmf_function *pfunc_cpu_setfreq_low;static struct pmf_function *pfunc_cpu_getfreq; -static struct pmf_function *pfunc_slewing_done;; +static struct pmf_function *pfunc_slewing_done;static int g5_pfunc_switch_freq (int speed_mode) {
arch/powerpc/platforms/powermac/pic.c +1 -1
@@ -609,7 +609,7 @@ static int pmacpic_find_viaint(void) np =of_find_node_by_name (NULL ,"via-pmu" );if (np ==NULL ) goto not_found; - viaint =irq_of_parse_and_map (np,0 );; + viaint =irq_of_parse_and_map (np,0 ); not_found:#endif /* CONFIG_ADB_PMU */
arch/powerpc/platforms/ps3/system-bus.c +0 -1
@@ -284,7 +284,6 @@ static int ps3_sb_free_mmio_region(struct ps3_mmio_region *r)int result;dump_mmio_region (r); -; result =lv1_unmap_device_mmio_region (r->dev->bus_id, r->dev->dev_id, r->lpar_addr);
arch/powerpc/sysdev/fsl_rio.c +1 -1
@@ -965,7 +965,7 @@ static inline void fsl_rio_info(struct device *dev, u32 ccsr)break ;default : str ="Unknown" ; -break ;; +break ; }dev_info (dev,"Hardware port width: %s\n" , str);
arch/powerpc/sysdev/ppc4xx_pci.c +2 -2
@@ -1531,7 +1531,7 @@ static void __init ppc4xx_configure_pciex_PIMs(struct ppc4xx_pciex_port *port,*/ /* Calculate window size */ - sa = (0xffffffffffffffffull <<ilog2 (ep_size));; + sa = (0xffffffffffffffffull <<ilog2 (ep_size));/* Setup BAR0 */ out_le32 (mbase +PECFG_BAR0HMPA ,RES_TO_U32_HIGH (sa));
@@ -1550,7 +1550,7 @@ static void __init ppc4xx_configure_pciex_PIMs(struct ppc4xx_pciex_port *port,out_le32 (mbase +PCI_BASE_ADDRESS_1 ,RES_TO_U32_HIGH (ep_addr)); }else {/* Calculate window size */ - sa = (0xffffffffffffffffull <<ilog2 (size));; + sa = (0xffffffffffffffffull <<ilog2 (size));if (res->flags &IORESOURCE_PREFETCH ) sa |=0x8 ;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 9/62 arch/sparc/kernel/irq_64.c: Remove unnecessary semicolons
In reply to Joe Perches--- arch/sparc/kernel/irq_64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/sparc/kernel/irq_64.c +1 -1
@@ -229,7 +229,7 @@ static unsigned int sun4u_compute_tid(unsigned long imap, unsigned long cpuid) tid = ((a <<IMAP_AID_SHIFT ) | (n <<IMAP_NID_SHIFT )); tid &= (IMAP_AID_SAFARI | -IMAP_NID_SAFARI );; +IMAP_NID_SAFARI ); } }else { tid = cpuid <<IMAP_TID_SHIFT ;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 8/62 arch/sh/boards/mach-se/7206/io.c: Remove unnecessary semicolons
In reply to Joe Perches--- arch/sh/boards/mach-se/7206/io.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/sh/boards/mach-se/7206/io.c +1 -1
@@ -50,7 +50,7 @@ unsigned char se7206_inb_p(unsigned long port)unsigned short se7206_inw (unsigned long port) { -return *port2adr (port);; +return *port2adr (port); }void se7206_outb (unsigned char value,unsigned long port)
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 6/62 arch/s390/hypfs/inode.c: Remove unnecessary semicolons
In reply to Joe Perches--- arch/s390/hypfs/inode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/s390/hypfs/inode.c +1 -1
@@ -500,7 +500,7 @@ static int __init hypfs_init(void) } s390_kobj =kobject_create_and_add ("s390" , hypervisor_kobj);if (!s390_kobj) { - rc = -ENOMEM ;; + rc = -ENOMEM ; goto fail_sysfs; } rc =register_filesystem (&hypfs_type);
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 59/62 fs/ocfs2/quota_global.c: Remove unnecessary semicolons
In reply to Joe Perches--- fs/ocfs2/quota_global.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/ocfs2/quota_global.c +1 -1
@@ -143,7 +143,7 @@ static int ocfs2_get_quota_block(struct inode *inode, int block, err = -EIO ;mlog_errno (err); } -return err;; +return err; }/* Read data from global quotafile - avoid pagecache and such because we cannot
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 11/62 arch/x86/kernel/ds.c: Remove unnecessary semicolons
In reply to Joe Perches--- arch/x86/kernel/ds.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/ds.c +1 -1
@@ -517,7 +517,7 @@ static inline unsigned long bts_get(const char *base, enum bts_field field)static inline void bts_set (char *base,enum bts_field field,unsigned long val) { - base += (ds_cfg.sizeof_ptr_field * field);; + base += (ds_cfg.sizeof_ptr_field * field); (*(unsigned long *)base) = val; }
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 13/62 drivers/block: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/block/DAC960.c | 4 ++-- drivers/block/swim3.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/block/DAC960.c +2 -2
@@ -6652,7 +6652,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request,else ErrorCode =get_user (ControllerNumber, &UserSpaceControllerInfo->ControllerNumber);if (ErrorCode !=0 ) -break ;; +break ; ErrorCode = -ENXIO ;if (ControllerNumber <0 || ControllerNumber > DAC960_ControllerCount -1 ) {
@@ -6660,7 +6660,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request, } Controller = DAC960_Controllers[ControllerNumber];if (Controller ==NULL ) -break ;; +break ;memset (&ControllerInfo,0 ,sizeof (DAC960_ControllerInfo_T)); ControllerInfo.ControllerNumber = ControllerNumber; ControllerInfo.FirmwareType = Controller->FirmwareType;
drivers/block/swim3.c +1 -1
@@ -1062,7 +1062,7 @@ static int swim3_add_device(struct macio_dev *mdev, int index) goto out_release; } fs->swim3_intr =macio_irq (mdev,0 ); - fs->dma_intr =macio_irq (mdev,1 );; + fs->dma_intr =macio_irq (mdev,1 ); fs->cur_cyl =-1 ; fs->cur_sector =-1 ; fs->secpercyl =36 ;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 14/62 drivers/char/epca.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/char/epca.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/char/epca.c +1 -1
@@ -2238,7 +2238,7 @@ static void do_softint(struct work_struct *work) struct channel *ch = container_of(work, struct channel, tqueue);/* Called in response to a modem change event */ if (ch && ch->magic ==EPCA_MAGIC ) { -struct tty_struct *tty =tty_port_tty_get (&ch->port);; +struct tty_struct *tty =tty_port_tty_get (&ch->port);if (tty && tty->driver_data) {if (test_and_clear_bit (EPCA_EVENT_HANGUP , &ch->event)) {
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 15/62 drivers/dma/fsldma.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/dma/fsldma.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/dma/fsldma.c +1 -1
@@ -136,7 +136,7 @@ static int dma_is_idle(struct fsl_dma_chan *fsl_chan)static void dma_start (struct fsl_dma_chan *fsl_chan) { -u32 mr_set =0 ;; +u32 mr_set =0 ;if (fsl_chan->feature &FSL_DMA_CHAN_PAUSE_EXT ) {DMA_OUT (fsl_chan, &fsl_chan->reg_base->bcr,0 ,32 );
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 16/62 drivers/dma: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/dma/dmatest.c | 2 +- drivers/dma/mv_xor.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/dma/dmatest.c +1 -1
@@ -114,7 +114,7 @@ static void dmatest_init_srcs(u8 **bufs, unsigned int start, unsigned int len) buf[i] =PATTERN_SRC | (~i &PATTERN_COUNT_MASK );for ( ; i < start + len; i++) buf[i] =PATTERN_SRC |PATTERN_COPY - | (~i &PATTERN_COUNT_MASK );; + | (~i &PATTERN_COUNT_MASK );for ( ; i < test_buf_size; i++) buf[i] =PATTERN_SRC | (~i &PATTERN_COUNT_MASK ); buf++;
drivers/dma/mv_xor.c +1 -1
@@ -1176,7 +1176,7 @@ static int __devinit mv_xor_probe(struct platform_device *pdev)if (dma_has_cap (DMA_MEMSET , dma_dev->cap_mask)) dma_dev->device_prep_dma_memset = mv_xor_prep_dma_memset;if (dma_has_cap (DMA_XOR , dma_dev->cap_mask)) { - dma_dev->max_xor =8 ; ; + dma_dev->max_xor =8 ; dma_dev->device_prep_dma_xor = mv_xor_prep_dma_xor; }
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 17/62 drivers/gpu/drm: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/radeon/r300.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -211,7 +211,7 @@ intel_dp_aux_ch(struct intel_output *intel_output,for (try =0 ; try <5 ; try++) {/* Load the send data into the aux channel data registers */ for (i =0 ; i < send_bytes; i +=4 ) { -uint32_t d =pack_aux (send + i, send_bytes - i);; +uint32_t d =pack_aux (send + i, send_bytes - i);I915_WRITE (ch_data + i, d); }
drivers/gpu/drm/radeon/r300.c +2 -2
@@ -1276,11 +1276,11 @@ static int r300_packet0_check(struct radeon_cs_parser *p,case 0x443C :/* TX_FILTER0_[0-15] */ i = (reg -0x4400 ) >>2 ; - tmp = ib_chunk->kdata[idx] &0x7 ;; + tmp = ib_chunk->kdata[idx] &0x7 ;if (tmp ==2 || tmp ==4 || tmp ==6 ) { track->textures[i].roundup_w = false; } - tmp = (ib_chunk->kdata[idx] >>3 ) &0x7 ;; + tmp = (ib_chunk->kdata[idx] >>3 ) &0x7 ;if (tmp ==2 || tmp ==4 || tmp ==6 ) { track->textures[i].roundup_h = false; }
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 21/62 drivers/macintosh/rack-meter.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/macintosh/rack-meter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/macintosh/rack-meter.c +1 -1
@@ -274,7 +274,7 @@ static void __devinit rackmeter_init_cpu_sniffer(struct rackmeter *rm)if (cpu >1 )continue ; - rcpu = &rm->cpu[cpu];; + rcpu = &rm->cpu[cpu]; rcpu->prev_idle =get_cpu_idle_time (cpu); rcpu->prev_wall =jiffies64_to_cputime64 (get_jiffies_64 ()); schedule_delayed_work_on(cpu, &rm->cpu[cpu].sniffer,
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 20/62 drivers/isdn/capi/capiutil.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/isdn/capi/capiutil.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/isdn/capi/capiutil.c +1 -1
@@ -1019,7 +1019,7 @@ int __init cdebug_init(void)if (!g_debbuf->buf) {kfree (g_cmsg);kfree (g_debbuf); -return -ENOMEM ;; +return -ENOMEM ; } g_debbuf->size =CDEBUG_GSIZE ; g_debbuf->buf[0 ] =0 ;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 26/62 drivers/mmc/host/imxmmc.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/mmc/host/imxmmc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mmc/host/imxmmc.c +1 -1
@@ -652,7 +652,7 @@ static irqreturn_t imxmci_irq(int irq, void *devid)set_bit (IMXMCI_PEND_STARTED_b, &host->pending_events);tasklet_schedule (&host->tasklet); -return IRQ_RETVAL (handled);; +return IRQ_RETVAL (handled); }static void imxmci_tasklet_fnc (unsigned long data)
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 25/62 drivers/mfd/twl4030-irq.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/mfd/twl4030-irq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mfd/twl4030-irq.c +1 -1
@@ -441,7 +441,7 @@ static void twl4030_sih_do_edge(struct work_struct *work)/* see what work we have */ spin_lock_irq (&sih_agent_lock); edge_change = agent->edge_change; - agent->edge_change =0 ;; + agent->edge_change =0 ; sih = edge_change ? agent->sih :NULL ;spin_unlock_irq (&sih_agent_lock);if (!sih)
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 36/62 drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/pcmcia/pcmcia_resource.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/pcmcia/pcmcia_resource.c +1 -1
@@ -489,7 +489,7 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,pccard_io_map iomap;if (!(s->state &SOCKET_PRESENT )) -return -ENODEV ;; +return -ENODEV ;if (req->IntType &INT_CARDBUS ) {ds_dbg (p_dev->socket,0 ,"IntType may not be INT_CARDBUS\n" );
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 37/62 drivers/regulator/pcf50633-regulator.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/regulator/pcf50633-regulator.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/regulator/pcf50633-regulator.c +1 -1
@@ -155,7 +155,7 @@ static int pcf50633_regulator_get_voltage(struct regulator_dev *rdev)int regulator_id, millivolts, volt_bits;u8 regnr; - pcf =rdev_get_drvdata (rdev);; + pcf =rdev_get_drvdata (rdev); regulator_id =rdev_get_id (rdev);if (regulator_id >=PCF50633_NUM_REGULATORS )
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 35/62 drivers/pci/pcie/aer/ecrc.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/pci/pcie/aer/ecrc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/pci/pcie/aer/ecrc.c +1 -1
@@ -106,7 +106,7 @@ void pcie_set_ecrc_checking(struct pci_dev *dev)disable_ecrc_checking (dev);break ;case ECRC_POLICY_ON : -enable_ecrc_checking (dev);; +enable_ecrc_checking (dev);break ;default :return ;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 39/62 drivers/s390/block/dasd_eckd.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/s390/block/dasd_eckd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/s390/block/dasd_eckd.c +1 -1
@@ -706,7 +706,7 @@ static int dasd_eckd_generate_uid(struct dasd_device *device, sizeof(uid->serial) - 1);EBCASC (uid->serial,sizeof (uid->serial) -1 ); uid->ssid = private->gneq->subsystemID; - uid->real_unit_addr = private->ned->unit_addr;; + uid->real_unit_addr = private->ned->unit_addr;if (private->sneq) { uid->type = private->sneq->sua_flags;if (uid->type ==UA_BASE_PAV_ALIAS )
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 41/62 drivers/s390/scsi/zfcp_scsi.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/s390/scsi/zfcp_scsi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/s390/scsi/zfcp_scsi.c +1 -1
@@ -101,7 +101,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt,if (unlikely ((status &ZFCP_STATUS_COMMON_ERP_FAILED ) || !(status &ZFCP_STATUS_COMMON_RUNNING ))) {zfcp_scsi_command_fail (scpnt,DID_ERROR ); -return 0 ;; +return 0 ; } ret =zfcp_fsf_send_fcp_command_task (unit, scpnt);
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 38/62 drivers/rtc/rtc-omap.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/rtc/rtc-omap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/rtc/rtc-omap.c +1 -1
@@ -430,7 +430,7 @@ fail: static int __exit omap_rtc_remove(struct platform_device *pdev) { -struct rtc_device *rtc =platform_get_drvdata (pdev);; +struct rtc_device *rtc =platform_get_drvdata (pdev);device_init_wakeup (&pdev->dev,0 );
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 46/62 drivers/staging: Remove unnecessary semicolons
In reply to Joe Perches--- .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- drivers/staging/comedi/drivers/comedi_bond.c | 2 +- drivers/staging/go7007/go7007-driver.c | 2 +- drivers/staging/otus/80211core/cmmsta.c | 2 +- drivers/staging/otus/hal/hpmain.c | 2 +- drivers/staging/rt2860/common/cmm_data_2860.c | 8 ++++---- drivers/staging/rt2860/rt_linux.c | 2 +- drivers/staging/rt2860/rtmp.h | 3 +-- drivers/staging/rt2860/sta/aironet.c | 2 +- drivers/staging/rtl8187se/r8185b_init.c | 2 +- drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 2 +- drivers/staging/rtl8192su/r8192U_core.c | 6 +++--- drivers/staging/rtl8192su/r819xU_phy.c | 2 +- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/iwctl.c | 2 +- drivers/staging/vt6655/wpa2.c | 4 ++-- 20 files changed, 26 insertions(+), 27 deletions(-)
drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c +1 -1
@@ -1008,7 +1008,7 @@ int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev, b_ExternGate = (unsigned char ) data[3 ]; b_CycleMode = (unsigned char ) data[4 ]; b_InterruptEnable = (unsigned char ) data[5 ]; - i_ReturnValue = insn->n;; + i_ReturnValue = insn->n; devpriv->tsk_Current = current;/* Save the current process task structure */ /**************************/ /* Test the module number */
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +1 -1
@@ -2834,7 +2834,7 @@ int i_APCI1500_Reset(struct comedi_device *dev) i_Logic =0 ; i_CounterLogic =0 ; i_InterruptMask =0 ; - i_InputChannel =0 ;; + i_InputChannel =0 ; i_TimerCounter1Enabled =0 ; i_TimerCounter2Enabled =0 ; i_WatchdogCounter3Enabled =0 ;
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c +1 -1
@@ -335,7 +335,7 @@ int i_APCI1516_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdereturn -EINVAL ; }/* if else data[3]==1) */ }/* if else data[3]==0) */ -return (insn->n);; +return (insn->n); }/*
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c +1 -1
@@ -339,7 +339,7 @@ int i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev, struct comedi_subdeint i_APCI3501_WriteAnalogOutput (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) { -unsigned int ul_Command1 =0 , ul_Channel_no, ul_Polarity, ul_DAC_Ready =0 ;; +unsigned int ul_Command1 =0 , ul_Channel_no, ul_Polarity, ul_DAC_Ready =0 ; ul_Channel_no =CR_CHAN (insn->chanspec);
drivers/staging/comedi/drivers/amplc_pci230.c +1 -1
@@ -918,7 +918,7 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (thisboard->ao_chans >0 ) { s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE |SDF_GROUND ; - s->n_chan = thisboard->ao_chans;; + s->n_chan = thisboard->ao_chans; s->maxdata = (1 << thisboard->ao_bits) -1 ; s->range_table = &pci230_ao_range; s->insn_write = &pci230_ao_winsn;
drivers/staging/comedi/drivers/comedi_bond.c +1 -1
@@ -400,7 +400,7 @@ static int doDevConfig(struct comedi_device *dev, struct comedi_devconfig *it)void *devs_opened[COMEDI_NUM_BOARD_MINORS ];memset (devs_opened,0 ,sizeof (devs_opened)); - devpriv->name[0 ] =0 ;; + devpriv->name[0 ] =0 ;/* Loop through all comedi devices specified on the command-line, building our device list */ for (i =0 ; i <COMEDI_NDEVCONFOPTS && (!i || it->options[i]); ++i) {
drivers/staging/go7007/go7007-driver.c +1 -1
@@ -647,7 +647,7 @@ struct go7007 *go7007_alloc(struct go7007_board_info *board, struct device *dev) go->dvd_mode =0 ; go->interlace_coding =0 ;for (i =0 ; i <4 ; ++i) - go->modet[i].enable =0 ;; + go->modet[i].enable =0 ;for (i =0 ; i <1624 ; ++i) go->modet_map[i] =0 ; go->audio_deliver =NULL ;
drivers/staging/otus/80211core/cmmsta.c +1 -1
@@ -1426,7 +1426,7 @@ struct zsBssInfo* zfStaFindBssInfo(zdev_t* dev, zbuf_t* buf, struct zsWlanProbeRif (zfHpIsAllowedChannel (dev,zfChNumToFreq (dev, channel,0 )) ==0 ) { frequency =0 ; }else { - frequency =zfChNumToFreq (dev, channel,0 );; + frequency =zfChNumToFreq (dev, channel,0 ); } }else { frequency =0 ;
drivers/staging/otus/hal/hpmain.c +1 -1
@@ -1455,7 +1455,7 @@ void zfHpSetFrequencyEx(zdev_t* dev, u32_t frequency, u8_t bw40,/* calibration that updates the pddac with the wrong polarity. Fortunately */ /* the second loop can be disabled with a bit called en_pd_dc_offset_thr. */ #if 0 - cmdB[0 ] =8 | (ZM_CMD_BITAND <<8 );; + cmdB[0 ] =8 | (ZM_CMD_BITAND <<8 ); cmdB[1 ] = (0xa27c +0x1bc000 ); cmdB[2 ] =0xffefffff ; ret =zfIssueCmd (dev, cmdB,12 ,ZM_OID_INTERNAL_WRITE ,0 );
drivers/staging/rt2860/common/cmm_data_2860.c +4 -4
@@ -80,7 +80,7 @@ USHORT RtmpPCI_WriteTxResource( pTxD->SDPtr0 = BufBasePaLow; pTxD->SDLen0 =TXINFO_SIZE +TXWI_SIZE + hwHeaderLen;// include padding - pTxD->SDPtr1 =PCI_MAP_SINGLE (pAd, pTxBlk,0 ,1 ,PCI_DMA_TODEVICE );; + pTxD->SDPtr1 =PCI_MAP_SINGLE (pAd, pTxBlk,0 ,1 ,PCI_DMA_TODEVICE ); pTxD->SDLen1 = pTxBlk->SrcBufLen; pTxD->LastSec0 =0 ; pTxD->LastSec1 = (bIsLast) ?1 :0 ;
@@ -139,7 +139,7 @@ USHORT RtmpPCI_WriteSingleTxResource( pTxD->SDPtr0 = BufBasePaLow; pTxD->SDLen0 =TXINFO_SIZE +TXWI_SIZE + hwHeaderLen;// include padding - pTxD->SDPtr1 =PCI_MAP_SINGLE (pAd, pTxBlk,0 ,1 ,PCI_DMA_TODEVICE );; + pTxD->SDPtr1 =PCI_MAP_SINGLE (pAd, pTxBlk,0 ,1 ,PCI_DMA_TODEVICE ); pTxD->SDLen1 = pTxBlk->SrcBufLen; pTxD->LastSec0 =0 ; pTxD->LastSec1 = (bIsLast) ?1 :0 ;
@@ -218,7 +218,7 @@ USHORT RtmpPCI_WriteMultiTxResource( pTxD->SDPtr0 = BufBasePaLow; pTxD->SDLen0 = firstDMALen;// include padding - pTxD->SDPtr1 =PCI_MAP_SINGLE (pAd, pTxBlk,0 ,1 ,PCI_DMA_TODEVICE );; + pTxD->SDPtr1 =PCI_MAP_SINGLE (pAd, pTxBlk,0 ,1 ,PCI_DMA_TODEVICE ); pTxD->SDLen1 = pTxBlk->SrcBufLen; pTxD->LastSec0 =0 ; pTxD->LastSec1 = (bIsLast) ?1 :0 ;
@@ -372,7 +372,7 @@ int RtmpPCIMgmtKickOut( pTxD->LastSec1 =1 ; pTxD->DMADONE =0 ; pTxD->SDLen1 =0 ; - pTxD->SDPtr0 =PCI_MAP_SINGLE (pAd, pSrcBufVA, SrcBufLen,0 ,PCI_DMA_TODEVICE );; + pTxD->SDPtr0 =PCI_MAP_SINGLE (pAd, pSrcBufVA, SrcBufLen,0 ,PCI_DMA_TODEVICE ); pTxD->SDLen0 = SrcBufLen; pAd->RalinkCounters.KickTxCount++;
drivers/staging/rt2860/rt_linux.c +1 -1
@@ -934,7 +934,7 @@ void send_monitor_packets( ph->rssi.did = DIDmsg_lnxind_wlansniffrm_rssi; ph->rssi.status =0 ; ph->rssi.len =4 ; - ph->rssi.data = (u_int32_t )RTMPMaxRssi (pAd,ConvertToRssi (pAd, pRxBlk->pRxWI->RSSI0,RSSI_0 ),ConvertToRssi (pAd, pRxBlk->pRxWI->RSSI1,RSSI_1 ),ConvertToRssi (pAd, pRxBlk->pRxWI->RSSI2,RSSI_2 ));; + ph->rssi.data = (u_int32_t )RTMPMaxRssi (pAd,ConvertToRssi (pAd, pRxBlk->pRxWI->RSSI0,RSSI_0 ),ConvertToRssi (pAd, pRxBlk->pRxWI->RSSI1,RSSI_1 ),ConvertToRssi (pAd, pRxBlk->pRxWI->RSSI2,RSSI_2 )); ph->signal.did = DIDmsg_lnxind_wlansniffrm_signal; ph->signal.status =0 ;
drivers/staging/rt2860/rtmp.h +1 -2
@@ -4507,8 +4507,7 @@ VOID IterateOnBssTab( IN PRTMP_ADAPTER pAd);VOID IterateOnBssTab2 ( - IN PRTMP_ADAPTER pAd);; - + IN PRTMP_ADAPTER pAd); VOID JoinParmFill( IN PRTMP_ADAPTER pAd, IN OUT MLME_JOIN_REQ_STRUCT *JoinReq,
drivers/staging/rt2860/sta/aironet.c +1 -1
@@ -367,7 +367,7 @@ VOID ChannelLoadRequestAction(if (NStatus !=NDIS_STATUS_SUCCESS )return ; - pNullFrame = (PHEADER_802_11 ) pOutBuffer;; + pNullFrame = (PHEADER_802_11 ) pOutBuffer;// Make the power save Null frame with PSM bit on MgtMacHeaderInit (pAd, pNullFrame,SUBTYPE_NULL_FUNC ,1 , pAd->CommonCfg.Bssid, pAd->CommonCfg.Bssid); pNullFrame->Duration =0 ;
drivers/staging/rtl8187se/r8185b_init.c +1 -1
@@ -2642,7 +2642,7 @@ SetRFPowerState(default :printk ("SetRFPowerState8185(): unknown RFChipID: 0x%X!!!\n" , priv->rf_chip); -break ;; +break ; }// printk("<--------- SetRFPowerState(): bResult(%d)\n", bResult);
drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c +1 -1
@@ -788,7 +788,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) { txb->queue_index =UP2AC (skb->priority); } else { - txb->queue_index =WME_AC_BK ;; + txb->queue_index =WME_AC_BK ; }
drivers/staging/rtl8192su/r8192U_core.c +3 -3
@@ -7454,7 +7454,7 @@ static void rtl8192SU_MacConfigBeforeFwDownloadASIC(struct net_device *dev)void rtl8192SU_HalUsbRxAggr8192SUsb (struct net_device *dev,bool Value) {struct r8192_priv *priv =ieee80211_priv ((struct net_device *)dev); -PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo;; +PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo;//
@@ -7527,7 +7527,7 @@ void rtl8192SU_HalUsbRxAggr8192SUsb(struct net_device *dev, bool Value)void rtl8192SU_HalUsbRxAggr8192SUsb (struct net_device *dev,bool Value) {struct r8192_priv *priv =ieee80211_priv ((struct net_device *)dev); -PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo;; +PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo;//
@@ -10688,7 +10688,7 @@ static void rtl8192_query_rxphystatus(//Get Rx snr value in DB tmp_rxsnr = pofdm_buf->rxsnr_X[i]; rx_snrX = (char )(tmp_rxsnr); -//rx_snrX >>= 1;; +//rx_snrX >>= 1; rx_snrX /=2 ; priv->stats.rxSNRdB[i] = (long )rx_snrX;
drivers/staging/rtl8192su/r819xU_phy.c +1 -1
@@ -1011,7 +1011,7 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device* dev, RF90_RADIO_PATH_Ebreak ; } -return ret;; +return ret; }/******************************************************************************
drivers/staging/vt6655/card.c +1 -1
@@ -2960,7 +2960,7 @@ BOOL CARDbSoftwareReset (PVOID pDeviceHandler)QWORD CARDqGetTSFOffset (BYTE byRxRate,QWORD qwTSF1,QWORD qwTSF2) {QWORD qwTSFOffset; -WORD wRxBcnTSFOffst=0 ;; +WORD wRxBcnTSFOffst=0 ;HIDWORD (qwTSFOffset) =0 ;LODWORD (qwTSFOffset) =0 ;
drivers/staging/vt6655/iwctl.c +1 -1
@@ -2168,7 +2168,7 @@ int iwctl_giwencodeext(struct net_device *dev,struct iw_point *wrq, char *extra) { - return -EOPNOTSUPP;; + return -EOPNOTSUPP; } int iwctl_siwmlme(struct net_device *dev,
drivers/staging/vt6655/wpa2.c +2 -2
@@ -225,7 +225,7 @@ WPA2vParseRSN ( m = *((PWORD ) &(pRSN->abyRSN[4 ]));if (pRSN->len >=10 +m*4 ) {// ver(2) + GK(4) + PK count(2) + PKS(4*m) + AKMSS count(2) - pBSSNode->wAKMSSAuthCount = *((PWORD ) &(pRSN->abyRSN[6 +4 *m]));; + pBSSNode->wAKMSSAuthCount = *((PWORD ) &(pRSN->abyRSN[6 +4 *m])); j =0 ; pbyOUI = &(pRSN->abyRSN[8 +4 *m]);for (i =0 ; (i < pBSSNode->wAKMSSAuthCount) && (j <sizeof (pBSSNode->abyAKMSSAuthType)/sizeof (BYTE )); i++) {
@@ -244,7 +244,7 @@ WPA2vParseRSN ( pBSSNode->wAKMSSAuthCount = (WORD )j;DEVICE_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "wAKMSSAuthCount: %d\n" , pBSSNode->wAKMSSAuthCount); - n = *((PWORD ) &(pRSN->abyRSN[6 +4 *m]));; + n = *((PWORD ) &(pRSN->abyRSN[6 +4 *m]));if (pRSN->len >=12 +4 *m+4 *n) {// ver(2)+GK(4)+PKCnt(2)+PKS(4*m)+AKMSSCnt(2)+AKMSS(4*n)+Cap(2) pBSSNode->sRSNCapObj.bRSNCapExist = TRUE; pBSSNode->sRSNCapObj.wRSNCap = *((PWORD ) &(pRSN->abyRSN[8 +4 *m+4 *n]));
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 48/62 drivers/uwb/i1480/i1480u-wlp/netdev.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/uwb/i1480/i1480u-wlp/netdev.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/uwb/i1480/i1480u-wlp/netdev.c +1 -1
@@ -214,7 +214,7 @@ int i1480u_open(struct net_device *net_dev)netif_wake_queue (net_dev);#ifdef i1480u_FLOW_CONTROL - result =usb_submit_urb (i1480u->notif_urb,GFP_KERNEL );; + result =usb_submit_urb (i1480u->notif_urb,GFP_KERNEL );if (result <0 ) {dev_err (dev,"Can't submit notification URB: %d\n" , result); goto error_notif_urb_submit;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 49/62 drivers/video/cfbcopyarea.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/video/cfbcopyarea.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/video/cfbcopyarea.c +1 -1
@@ -114,7 +114,7 @@ bitcpy(struct fb_info *p, unsigned long __iomem *dst, int dst_idx, d0 >>= right; }else if (src_idx+n <= bits) {// Single source word - d0 <<= left;; + d0 <<= left; }else {// 2 source words d1 =FB_READL (src +1 );
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 47/62 drivers/usb: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/usb/class/cdc-wdm.c | 2 -- drivers/usb/serial/spcp8x5.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-)
drivers/usb/class/cdc-wdm.c +0 -2
@@ -507,8 +507,6 @@ static int wdm_open(struct inode *inode, struct file *file) desc =usb_get_intfdata (intf);if (test_bit (WDM_DISCONNECTING , &desc->flags)) goto out; - - ; file->private_data = desc; rv =usb_autopm_get_interface (desc->intf);
drivers/usb/serial/spcp8x5.c +1 -1
@@ -546,7 +546,7 @@ static void spcp8x5_set_termios(struct tty_struct *tty, }/* Set Baud Rate */ - baud =tty_get_baud_rate (tty);; + baud =tty_get_baud_rate (tty);switch (baud) {case 300 : buf[0 ] =0x00 ;break ;case 600 : buf[0 ] =0x01 ;break ;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 51/62 drivers/video/s3c2410fb.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/video/s3c2410fb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/video/s3c2410fb.c +1 -1
@@ -1119,7 +1119,7 @@ int __init s3c2410fb_init(void)int ret =platform_driver_register (&s3c2410fb_driver);if (ret ==0 ) - ret =platform_driver_register (&s3c2412fb_driver);; + ret =platform_driver_register (&s3c2412fb_driver);return ret; }
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 52/62 drivers/watchdog/bcm47xx_wdt.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/watchdog/bcm47xx_wdt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/watchdog/bcm47xx_wdt.c +1 -1
@@ -161,7 +161,7 @@ static long bcm47xx_wdt_ioctl(struct file *file, {void __user *argp = (void __user *)arg;int __user *p = argp; -int new_value, retval = -EINVAL ;; +int new_value, retval = -EINVAL ;switch (cmd) {case WDIOC_GETSUPPORT :
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 56/62 fs/cifs/cifs_dfs_ref.c: Remove unnecessary semicolons
In reply to Joe Perches--- fs/cifs/cifs_dfs_ref.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/cifs/cifs_dfs_ref.c +1 -1
@@ -136,7 +136,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata, rc =dns_resolve_server_name_to_ip (*devname, &srvIP);if (rc !=0 ) {cERROR (1 , ("%s: Failed to resolve server part of %s to IP: %d" , - __func__, *devname, rc));; + __func__, *devname, rc)); goto compose_mount_options_err; }/* md_len = strlen(...) + 12 for 'sep+prefixpath='
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 40/62 drivers/s390/net/netiucv.c: Remove unnecessary semicolons
In reply to Joe Perches--- drivers/s390/net/netiucv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/s390/net/netiucv.c +1 -1
@@ -2113,7 +2113,7 @@ static ssize_t remove_write (struct device_driver *drv,IUCV_DBF_TEXT (trace,3 , __func__);if (count >=IFNAMSIZ ) - count =IFNAMSIZ -1 ;; + count =IFNAMSIZ -1 ;for (i =0 , p = buf; i < count && *p; i++, p++) {if (*p =='\n' || *p ==' ' )
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 61/62 net/wireless/wext-compat.c: Remove unnecessary semicolons
In reply to Joe Perches--- net/wireless/wext-compat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/wireless/wext-compat.c +1 -1
@@ -794,7 +794,7 @@ int cfg80211_wext_siwtxpower(struct net_device *dev,return 0 ; } -return rdev->ops->set_tx_power (wdev->wiphy, type, dbm);; +return rdev->ops->set_tx_power (wdev->wiphy, type, dbm); }EXPORT_SYMBOL_GPL (cfg80211_wext_siwtxpower);
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 60/62 kernel/trace/trace_hw_branches.c: Remove unnecessary semicolons
In reply to Joe Perches--- kernel/trace/trace_hw_branches.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/trace_hw_branches.c +1 -1
@@ -155,7 +155,7 @@ static enum print_line_t bts_trace_print_line(struct trace_iterator *iter) seq_print_ip_sym(seq, it->from, symflags) && trace_seq_printf(seq, "\n"))return TRACE_TYPE_HANDLED ; -return TRACE_TYPE_PARTIAL_LINE ;; +return TRACE_TYPE_PARTIAL_LINE ; }return TRACE_TYPE_UNHANDLED ; }
Signature · 1 line
1.6.3.1.10.g659a0.dirty
Re: [PATCH 11/62] arch/x86/kernel/ds.c: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 10 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>--- arch/x86/kernel/ds.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/x86/kernel/ds.c +0
-0
arch/x86/kernel/ds.c static inline unsigned long bts_get(const char *base, enum bts_field field) · line 523
Quoted 8 lines
arch/x86/kernel/ds.c +1
-1@@ -517,7 +517,7 @@ static inline unsigned long bts_get(const char *base, enum bts_field field)static inline void bts_set (char *base,enum bts_field field,unsigned long val) { - base += (ds_cfg.sizeof_ptr_field * field);; + base += (ds_cfg.sizeof_ptr_field * field); (*(unsigned long *)base) = val; }
This is already fix in -tip by :
commit feaa0457ec8351cae855edc9a3052ac49322538e
Author: Jaswinder Singh Rajput <[email protected]> Date: Sat Jun 20 16:15:40 2009 +0530
x86: ds.c fix invalid assignment
Thanks,
--
JSR
Re: [PATCH 56/62] fs/cifs/cifs_dfs_ref.c: Remove unnecessary semicolons
In reply to Joe PerchesThis fix is fine of course.
Do you prefer that I merge this via the cifs-2.6 tree or as part of your large patch series?
Quoted 22 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>---
fs/cifs/cifs_dfs_ref.c | 2 +-1 files changed, 1 insertions(+), 1 deletions(-)fs/cifs/cifs_dfs_ref.c +1
-2@@ -136,7 +136,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata, rc = dns_resolve_server_name_to_ip(*devname, &srvIP); if (rc != 0) { cERROR(1, ("%s: Failed to resolve server part of %s to IP: %d", - __func__, *devname, rc));; + __func__, *devname, rc)); goto compose_mount_options_err; } /* md_len = strlen(...) + 12 for 'sep+prefixpath=' -- 1.6.3.1.10.g659a0.dirty
Signature · 3 lines
Thanks, Steve
Re: [PATCH 56/62] fs/cifs/cifs_dfs_ref.c: Remove unnecessary semicolons
Quoted 4 lines · Steve French
This fix is fine of course.
Do you prefer that I merge this via the cifs-2.6 tree or as part of your large patch series?
I don't have a preference for how it gets merged.
Perhaps others do.
Quoted 6 lines · On Sun, 28 Jun 2009 09:26:05 -0700 Joe Perches <[email protected]> wrote:
Found by script
#!/bin/bashfrom=";\s*;\s*\n"
to=";\n"
Quoted 7 lines
for file in $(grep -rP --include=*.[ch] -li $from *) ; do
perl -i -e \ "local $/; while(<>) { s/$from/$to/g; print; }" $filedone
can you improve your descriptions please?
to at least include the why for a change, not just the how and what...
Signature · 3 lines
Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org
Quoted 2 lines · Arjan van de Ven
can you improve your descriptions please?
to at least include the why for a change, not just the how and what...
Is any part of "Remove unnecessary semicolons" unclear?
What would you prefer?
Re: [PATCH 22/62] drivers/media/video/cx18/cx18-fileops.c: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 10 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>--- drivers/media/video/cx18/cx18-fileops.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/media/video/cx18/cx18-fileops.c +0
-0
drivers/media/video/cx18/cx18-fileops.c int cx18_v4l2_open(struct file *filp) · line 696
Quoted 8 lines
drivers/media/video/cx18/cx18-fileops.c +1
-1@@ -690,7 +690,7 @@ int cx18_v4l2_open(struct file *filp)int res;struct video_device *video_dev =video_devdata (filp);struct cx18_stream *s =video_get_drvdata (video_dev); -struct cx18 *cx = s->cx;; +struct cx18 *cx = s->cx;mutex_lock (&cx->serialize_lock);if (cx18_init_on_first_open (cx)) {
This is on topic for the ivtv-devel list, but must we spam the ivtv-users list with this sort of trivia?
Perhaps your Maintainers file scraper script could be tweaked a little?
Regards,
Andy
Re: [PATCH 22/62] drivers/media/video/cx18/cx18-fileops.c: Remove unnecessary semicolons
Quoted 4 lines · Andy Walls
This is on topic for the ivtv-devel list, but must we spam the ivtv-users list with this sort of trivia?
Perhaps your Maintainers file scraper script could be tweaked a little?
Perhaps the ivtv-users list entries should be removed from MAINTAINERS
Quoted 9 lines · On Sun, 28 Jun 2009 10:16:05 -0700 Joe Perches <[email protected]> wrote:
Quoted 3 lines · Arjan van de Ven
can you improve your descriptions please?
to at least include the why for a change, not just the how and what...Is any part of "Remove unnecessary semicolons" unclear?
What would you prefer?
your sentence addresses the what question, no the why question
or in business words: whats the value proposition
Signature · 3 lines
Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org
Quoted 11 lines · Arjan van de Ven
Quoted 6 lines · On Sun, 28 Jun 2009 10:16:05 -0700 Joe Perches <[email protected]> wrote:
Quoted 3 lines · Arjan van de Ven
can you improve your descriptions please?
to at least include the why for a change, not just the how and what...Is any part of "Remove unnecessary semicolons" unclear? What would you prefer?
your sentence addresses the what question, no the why question or in business words: whats the value proposition
Are any of these better?
Saving the world, one byte at a time...
Because they're unnecessary...
Because they cause visual stalls when humans parse them... Just for fun...
?
Re: [PATCH 14/62] drivers/char/epca.c: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 4 lines · On Sun, 28 Jun 2009 09:26:19 -0700 Joe Perches <[email protected]> wrote:
Signed-off-by Joe Perches <[email protected]>--- drivers/char/epca.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
If you must do this then please roll it into a single patch and get it applied so it doesn't mess up all the pending patches. Really though I have to ask what the point is - it just makes other patches not apply and creates noise work.
Ralf Baechle
AppliedRe: [PATCH 04/62] arch/mips/kernel/vpe.c: Remove unnecessary semicolons
In reply to Joe PerchesOn Sun, Jun 28, 2009 at 09:26:09AM -0700, Joe Perches wrote:
Thanks, applied.
Ralf
Re: [PATCH 41/62] drivers/s390/scsi/zfcp_scsi.c: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 10 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>--- drivers/s390/scsi/zfcp_scsi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/s390/scsi/zfcp_scsi.c +0
-0
drivers/s390/scsi/zfcp_scsi.c static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt, · line 107
Quoted 8 lines
drivers/s390/scsi/zfcp_scsi.c +1
-1@@ -101,7 +101,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt,if (unlikely ((status &ZFCP_STATUS_COMMON_ERP_FAILED ) || !(status &ZFCP_STATUS_COMMON_RUNNING ))) {zfcp_scsi_command_fail (scpnt,DID_ERROR ); -return 0 ;; +return 0 ; } ret =zfcp_fsf_send_fcp_command_task (unit, scpnt);
Indeed, very trivial.
Re: [PATCH 22/62] drivers/media/video/cx18/cx18-fileops.c: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 7 lines · Joe Perches
Quoted 4 lines · Andy Walls
This is on topic for the ivtv-devel list, but must we spam the ivtv-users list with this sort of trivia?
Perhaps your Maintainers file scraper script could be tweaked a little?
Perhaps the ivtv-users list entries should be removed from
MAINTAINERS
OK by me for 'CX18 VIDEO4LINUX DRIVER'.
Also, a second website entry should be to be added for 'CX18 VIDEO4LINUX DRIVER'
W: http://www.ivtvdriver.org/index.php/Cx18
Regards,
Andy
Quoted 14 lines · On Sun, 28 Jun 2009 10:11:59 -0700 Arjan van de Ven <[email protected]> wrote:
Quoted 11 lines · On Sun, 28 Jun 2009 09:26:05 -0700 Joe Perches <[email protected]> wrote:
Found by script
#!/bin/bashfrom=";\s*;\s*\n"
to=";\n"for file in $(grep -rP --include=*.[ch] -li $from *) ; do
perl -i -e \ "local $/; while(<>) { s/$from/$to/g; print; }" $file
Quoted 6 lines
Quoted 2 lines
done
can you improve your descriptions please?
to at least include the why for a change, not just the how and what...
The [0/n] text doesn't get into git anyway (unless someone manually copies-n-pastes it).
Each of the actual patches have no changelog at all, and they don't need one - it's utterly obvious what they're doing.
So I don't believe that anything needs to be changed here.
PATCH 1/1 MAINTAINERS: Remove ivtv-user lists, add CX18 url
In reply to Andy WallsQuoted 10 lines · Andy Walls
Quoted 5 lines · Joe Perches
Quoted 3 lines · Andy Walls
This is on topic for the ivtv-devel list, but must we spam the ivtv-users list with this sort of trivia?
Perhaps your Maintainers file scraper script could be tweaked a little?Perhaps the ivtv-users list entries should be removed from
MAINTAINERSOK by me for 'CX18 VIDEO4LINUX DRIVER'.
Also, a second website entry should be to be added for 'CX18 VIDEO4LINUX DRIVER'
W: http://www.ivtvdriver.org/index.php/Cx18
MAINTAINERS +1 -2
@@ -1678,10 +1678,10 @@ M: [email protected] P: Andy Walls M: [email protected] L: [email protected] -L: [email protected] L: [email protected] T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git W: http://linuxtv.org +W: http://www.ivtvdriver.org/index.php/Cx18 S: Maintained F: Documentation/video4linux/cx18.txt F: drivers/media/video/cx18/
@@ -3231,7 +3231,6 @@ IVTV VIDEO4LINUX DRIVER P: Hans Verkuil M: [email protected] L: [email protected] -L: [email protected] L: [email protected] T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git W: http://www.ivtvdriver.org
Re: [PATCH] MAINTAINERS: Remove ivtv-user lists, add CX18 url
Quoted 31 lines · Joe Perches
Quoted 10 lines · Andy Walls
Quoted 5 lines · Joe Perches
Quoted 3 lines · Andy Walls
This is on topic for the ivtv-devel list, but must we spam the ivtv-users list with this sort of trivia?
Perhaps your Maintainers file scraper script could be tweaked a little?Perhaps the ivtv-users list entries should be removed from
MAINTAINERSOK by me for 'CX18 VIDEO4LINUX DRIVER'.
Also, a second website entry should be to be added for 'CX18 VIDEO4LINUX DRIVER'
W: http://www.ivtvdriver.org/index.php/Cx18Signed-off-by Joe Perches <[email protected]>MAINTAINERS +1
-1@@ -1678,10 +1678,10 @@ M: [email protected] P: Andy Walls M: [email protected] L: [email protected] -L: [email protected] L: [email protected] T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git W: http://linuxtv.org +W: http://www.ivtvdriver.org/index.php/Cx18 S: Maintained F: Documentation/video4linux/cx18.txt F: drivers/media/video/cx18/
MAINTAINERS IVTV VIDEO4LINUX DRIVER · line 3236
Quoted 7 lines
MAINTAINERS +0
-1@@ -3231,7 +3231,6 @@ IVTV VIDEO4LINUX DRIVER P: Hans Verkuil M: [email protected] L: [email protected] -L: [email protected] L: [email protected] T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git W: http://www.ivtvdriver.org
Regards,
Andy
David Miller
maintainerFrom: Arjan van de Ven <[email protected]>
Date: Sun, 28 Jun 2009 10:43:32 -0700
Quoted 8 lines
Quoted 5 lines · On Sun, 28 Jun 2009 10:16:05 -0700 Joe Perches <[email protected]> wrote:
Quoted 3 lines · Arjan van de Ven
can you improve your descriptions please?
to at least include the why for a change, not just the how and what...
Quoted 8 lines
Quoted 4 lines
Is any part of "Remove unnecessary semicolons" unclear?
What would you prefer?
your sentence addresses the what question, no the why question
or in business words: whats the value proposition
I think you're going overboard in these requirements.
Extraneous semi-colons dirty up the code, make it confusing and make hard to find bugs more likely to be present or (even worse) get added unintentionally in the future. And every programmer worth his salt should be aware of this.
David Miller
maintainerRe: [PATCH 14/62] drivers/char/epca.c: Remove unnecessary semicolons
In reply to Alan CoxFrom: Alan Cox <[email protected]>
Date: Sun, 28 Jun 2009 18:51:02 +0100
Quoted 8 lines
Quoted 4 lines · On Sun, 28 Jun 2009 09:26:19 -0700 Joe Perches <[email protected]> wrote:
Signed-off-by Joe Perches <[email protected]>--- drivers/char/epca.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Quoted 4 lines
If you must do this then please roll it into a single patch and get it applied so it doesn't mess up all the pending patches. Really though I have to ask what the point is - it just makes other patches not apply and creates noise work.
It has made bugs get added in the past, and makes code confusing to read sometimes. I'm all for this, to be honest, and I'm very much for rolling this into one single patch too :)
PATCH 1/1 MAINTAINERS: QLGE 10Gb ETHERNET - pair P:/M: entries properly
In reply to Joe PerchesMAINTAINERS +1 -1
@@ -4766,8 +4766,8 @@ F: drivers/net/qla3xxx.* QLOGIC QLGE 10Gb ETHERNET DRIVER P: Ron Mercer -M: [email protected] M: [email protected] +M: [email protected] L: [email protected] S: Supported F: drivers/net/qlge/
Re: [PATCH] MAINTAINERS: QLGE 10Gb ETHERNET - pair P:/M: entries properly
From: Joe Perches <[email protected]>
Date: Sun, 28 Jun 2009 11:35:19 -0700
Quoted 1 line
Signed-off-by Joe Perches <[email protected]>
Quoted 16 lines · On Sun, 28 Jun 2009 11:32:34 -0700 (PDT) David Miller <[email protected]>…
From: Arjan van de Ven <[email protected]>
Date: Sun, 28 Jun 2009 10:43:32 -0700Quoted 13 lines
Quoted 9 lines · On Sun, 28 Jun 2009 10:16:05 -0700 Joe Perches <[email protected]> wrote:
Quoted 3 lines · Arjan van de Ven
can you improve your descriptions please?
to at least include the why for a change, not just the how and what...Is any part of "Remove unnecessary semicolons" unclear?
What would you prefer?
Quoted 7 lines
Quoted 2 lines
your sentence addresses the what question, no the why question
I think you're going overboard in these requirements.
Extraneous semi-colons dirty up the code, make it confusing and make hard to find bugs more likely to be present or (even worse) get added unintentionally in the future.
... and this sentence would have been a really good changelog.
Signature · 3 lines
Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org
PATCH 1/1 Remove unnecessary semicolons
In reply to David MillerQuoted 2 lines · David Miller
I'm all for this, to be honest, and I'm very much for rolling this into one single patch too :)
Here's just the single one, but doesn't a patch
that span multiple arches make it a bit more
troublesome for the arch maintainers?
arch/arm/mach-at91/at91cap9_devices.c | 2 +- arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- arch/arm/mach-w90x900/w90p910.c | 2 +- arch/arm/plat-mxc/irq.c | 2 +- arch/ia64/kernel/esi.c | 2 +- arch/ia64/kvm/process.c | 6 +++--- arch/ia64/kvm/vcpu.c | 2 +- arch/ia64/kvm/vtlb.c | 4 ++-- arch/m68knommu/kernel/time.c | 2 +- arch/mips/kernel/vpe.c | 2 +- arch/powerpc/mm/tlb_hash64.c | 2 +- arch/powerpc/oprofile/cell/vma_map.c | 2 +- arch/powerpc/platforms/powermac/cpufreq_64.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 2 +- arch/powerpc/platforms/ps3/system-bus.c | 1 - arch/powerpc/sysdev/fsl_rio.c | 2 +- arch/powerpc/sysdev/ppc4xx_pci.c | 4 ++-- arch/s390/hypfs/inode.c | 2 +- arch/s390/kvm/interrupt.c | 2 +- arch/sh/boards/mach-se/7206/io.c | 2 +- arch/sparc/kernel/irq_64.c | 2 +- arch/um/drivers/net_kern.c | 2 +- arch/x86/kernel/ds.c | 2 +- drivers/ata/pata_octeon_cf.c | 2 +- drivers/ata/sata_inic162x.c | 2 +- drivers/block/DAC960.c | 4 ++-- drivers/block/swim3.c | 2 +- drivers/char/epca.c | 2 +- drivers/dma/dmatest.c | 2 +- drivers/dma/fsldma.c | 2 +- drivers/dma/mv_xor.c | 2 +- drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/radeon/r300.c | 4 ++-- drivers/hwmon/sht15.c | 2 +- drivers/ide/ide-probe.c | 2 +- drivers/ide/umc8672.c | 4 ++-- drivers/isdn/capi/capiutil.c | 2 +- drivers/macintosh/rack-meter.c | 2 +- drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 2 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 2 +- drivers/media/dvb/frontends/cx24123.c | 2 +- drivers/media/dvb/frontends/dib0070.c | 2 +- drivers/media/dvb/frontends/stv0900_sw.c | 2 +- drivers/media/video/cx18/cx18-fileops.c | 2 +- drivers/media/video/cx231xx/cx231xx-video.c | 4 ++-- drivers/media/video/cx23885/cx23885.h | 2 +- drivers/media/video/ivtv/ivtv-driver.c | 2 +- drivers/mfd/twl4030-irq.c | 2 +- drivers/mmc/host/imxmmc.c | 2 +- drivers/net/arcnet/arc-rawmode.c | 1 - drivers/net/arcnet/capmode.c | 1 - drivers/net/bnx2x_link.c | 2 +- drivers/net/gianfar_ethtool.c | 2 +- drivers/net/ibm_newemac/core.c | 8 ++++---- drivers/net/igb/igb_main.c | 4 ++-- drivers/net/ll_temac_main.c | 2 +- drivers/net/ni52.c | 4 ++-- drivers/net/qlge/qlge_main.c | 4 ++-- drivers/net/skfp/pcmplc.c | 2 +- drivers/net/skfp/pmf.c | 8 ++++---- drivers/net/skge.c | 2 +- drivers/net/sky2.c | 2 +- drivers/net/vxge/vxge-config.h | 2 +- drivers/net/vxge/vxge-main.c | 2 +- drivers/net/wireless/ath/ath9k/eeprom.c | 2 -- drivers/net/wireless/ath/ath9k/hw.c | 2 +- drivers/net/wireless/iwmc3200wifi/rx.c | 8 ++++---- drivers/pci/pcie/aer/ecrc.c | 2 +- drivers/pcmcia/pcmcia_resource.c | 2 +- drivers/regulator/pcf50633-regulator.c | 2 +- drivers/rtc/rtc-omap.c | 2 +- drivers/s390/block/dasd_eckd.c | 2 +- drivers/s390/net/netiucv.c | 2 +- drivers/s390/scsi/zfcp_scsi.c | 2 +- drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- drivers/scsi/lpfc/lpfc_ct.c | 2 +- drivers/spi/omap_uwire.c | 2 +- drivers/spi/spi_s3c24xx.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- drivers/staging/comedi/drivers/comedi_bond.c | 2 +- drivers/staging/go7007/go7007-driver.c | 2 +- drivers/staging/otus/80211core/cmmsta.c | 2 +- drivers/staging/otus/hal/hpmain.c | 2 +- drivers/staging/rt2860/common/cmm_data_2860.c | 8 ++++---- drivers/staging/rt2860/rt_linux.c | 2 +- drivers/staging/rt2860/rtmp.h | 3 +-- drivers/staging/rt2860/sta/aironet.c | 2 +- drivers/staging/rtl8187se/r8185b_init.c | 2 +- drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 2 +- drivers/staging/rtl8192su/r8192U_core.c | 6 +++--- drivers/staging/rtl8192su/r819xU_phy.c | 2 +- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/iwctl.c | 2 +- drivers/staging/vt6655/wpa2.c | 4 ++-- drivers/usb/class/cdc-wdm.c | 2 -- drivers/usb/serial/spcp8x5.c | 2 +- drivers/uwb/i1480/i1480u-wlp/netdev.c | 2 +- drivers/video/cfbcopyarea.c | 2 +- drivers/video/imxfb.c | 2 +- drivers/video/s3c2410fb.c | 2 +- drivers/watchdog/bcm47xx_wdt.c | 2 +- drivers/xen/balloon.c | 2 +- fs/autofs/dirhash.c | 2 +- fs/btrfs/tree-log.c | 2 +- fs/cifs/cifs_dfs_ref.c | 2 +- fs/ext4/mballoc.c | 2 +- fs/nfs/callback_xdr.c | 2 +- fs/ocfs2/quota_global.c | 2 +- include/scsi/fc/fc_fc2.h | 3 +-- kernel/trace/trace_hw_branches.c | 2 +- net/wireless/wext-compat.c | 2 +- sound/oss/sys_timer.c | 3 --- sound/soc/codecs/wm9081.c | 2 +- sound/soc/pxa/pxa-ssp.c | 2 +- sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 +- 119 files changed, 139 insertions(+), 151 deletions(-)
arch/arm/mach-at91/at91cap9_devices.c +1 -1
@@ -171,7 +171,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)*/ usba_udc_data.pdata.vbus_pin = -EINVAL ; usba_udc_data.pdata.num_ep =ARRAY_SIZE (usba_udc_ep); -memcpy (usba_udc_data.ep, usba_udc_ep,sizeof (usba_udc_ep));; +memcpy (usba_udc_data.ep, usba_udc_ep,sizeof (usba_udc_ep));if (data && data->vbus_pin >0 ) {at91_set_gpio_input (data->vbus_pin,0 );
arch/arm/mach-at91/at91sam9rl_devices.c +1 -1
@@ -99,7 +99,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)*/ usba_udc_data.pdata.vbus_pin = -EINVAL ; usba_udc_data.pdata.num_ep =ARRAY_SIZE (usba_udc_ep); -memcpy (usba_udc_data.ep, usba_udc_ep,sizeof (usba_udc_ep));; +memcpy (usba_udc_data.ep, usba_udc_ep,sizeof (usba_udc_ep));if (data && data->vbus_pin >0 ) {at91_set_gpio_input (data->vbus_pin,0 );
arch/arm/mach-w90x900/w90p910.c +1 -1
@@ -62,7 +62,7 @@ static DEFINE_CLK(atapi, 6); static DEFINE_CLK(emc, 7); static DEFINE_CLK(usbd, 8); static DEFINE_CLK(usbh, 9); -static DEFINE_CLK(g2d, 10);; +static DEFINE_CLK(g2d, 10); static DEFINE_CLK(pwm, 18); static DEFINE_CLK(ps2, 24); static DEFINE_CLK(kpi, 25);
arch/arm/plat-mxc/irq.c +1 -1
@@ -53,7 +53,7 @@ int imx_irq_set_priority(unsigned char irq, unsigned char prio)unsigned int mask =0x0F << irq %8 *4 ;if (irq >=MXC_INTERNAL_IRQS ) -return -EINVAL ;; +return -EINVAL ; temp =__raw_readl (avic_base +AVIC_NIPRIORITY (irq /8 )); temp &= ~mask;
arch/ia64/kernel/esi.c +1 -1
@@ -65,7 +65,7 @@ static int __init esi_init (void) }if (!esi) -return -ENODEV ;; +return -ENODEV ; systab =__va (esi);
arch/ia64/kvm/process.c +3 -3
@@ -130,7 +130,7 @@ static void collect_interruption(struct kvm_vcpu *vcpu)if (vdcr &IA64_DCR_PP ) { vpsr |=IA64_PSR_PP ; }else { - vpsr &= ~IA64_PSR_PP ;; + vpsr &= ~IA64_PSR_PP ; }vcpu_set_psr (vcpu, vpsr);
@@ -594,11 +594,11 @@ static void set_pal_call_data(struct kvm_vcpu *vcpu) p->u.pal_data.gr30 =vcpu_get_gr (vcpu,30 );break ;case PAL_BRAND_INFO : - p->u.pal_data.gr29 = gr29;; + p->u.pal_data.gr29 = gr29; p->u.pal_data.gr30 =kvm_trans_pal_call_args (vcpu, gr30);break ;default : - p->u.pal_data.gr29 = gr29;; + p->u.pal_data.gr29 = gr29; p->u.pal_data.gr30 =vcpu_get_gr (vcpu,30 ); } p->u.pal_data.gr28 = gr28;
arch/ia64/kvm/vcpu.c +1 -1
@@ -406,7 +406,7 @@ void getreg(unsigned long regnum, unsigned long *val,* Now look at registers in [0-31] range and init correct UNAT */ addr = (unsigned long )regs; - unat = ®s->eml_unat;; + unat = ®s->eml_unat; addr += gr_info[regnum];
arch/ia64/kvm/vtlb.c +2 -2
@@ -135,7 +135,7 @@ struct thash_data *__vtr_lookup(struct kvm_vcpu *vcpu, u64 va, int type)u64 rid; rid =vcpu_get_rr (vcpu, va); - rid = rid &RR_RID_MASK ;; + rid = rid &RR_RID_MASK ;if (type ==D_TLB ) {if (vcpu_quick_region_check (vcpu->arch.dtr_regions, va)) { for (trp = (struct thash_data *)&vcpu->arch.dtrs, i = 0;
@@ -518,7 +518,7 @@ struct thash_data *vtlb_lookup(struct kvm_vcpu *v, u64 va, int is_data)struct thash_cb *hcb = &v->arch.vtlb; - cch =__vtr_lookup (v, va, is_data);; + cch =__vtr_lookup (v, va, is_data);if (cch)return cch;
arch/m68knommu/kernel/time.c +1 -1
@@ -69,7 +69,7 @@ static unsigned long read_rtc_mmss(void)if ((year +=1900 ) <1970 ) year +=100 ; -return mktime (year, mon, day, hour, min, sec);; +return mktime (year, mon, day, hour, min, sec); }unsigned long read_persistent_clock (void )
arch/mips/kernel/vpe.c +1 -1
@@ -1387,7 +1387,7 @@ static ssize_t store_ntcs(struct device *dev, struct device_attribute *attr,return len; out_einval: -return -EINVAL ;; +return -EINVAL ; }static struct device_attribute vpe_class_attributes[] = {
arch/powerpc/mm/tlb_hash64.c +1 -1
@@ -72,7 +72,7 @@ void hpte_need_flush(struct mm_struct *mm, unsigned long addr,*/ if (huge) {#ifdef CONFIG_HUGETLB_PAGE - psize =get_slice_psize (mm, addr);; + psize =get_slice_psize (mm, addr);#else BUG (); psize =pte_pagesize_index (mm, addr, pte);/* shutup gcc */
arch/powerpc/oprofile/cell/vma_map.c +1 -1
@@ -185,7 +185,7 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu, goto fail;if (shdr_str.sh_type !=SHT_STRTAB ) - goto fail;; + goto fail;for (j =0 ; j < shdr.sh_size /sizeof (sym); j++) { if (copy_from_user(&sym, spu_elf_start +
arch/powerpc/platforms/powermac/cpufreq_64.c +1 -1
@@ -251,7 +251,7 @@ static void g5_pfunc_switch_volt(int speed_mode)static struct pmf_function *pfunc_cpu_setfreq_high;static struct pmf_function *pfunc_cpu_setfreq_low;static struct pmf_function *pfunc_cpu_getfreq; -static struct pmf_function *pfunc_slewing_done;; +static struct pmf_function *pfunc_slewing_done;static int g5_pfunc_switch_freq (int speed_mode) {
arch/powerpc/platforms/powermac/pic.c +1 -1
@@ -609,7 +609,7 @@ static int pmacpic_find_viaint(void) np =of_find_node_by_name (NULL ,"via-pmu" );if (np ==NULL ) goto not_found; - viaint =irq_of_parse_and_map (np,0 );; + viaint =irq_of_parse_and_map (np,0 ); not_found:#endif /* CONFIG_ADB_PMU */
arch/powerpc/platforms/ps3/system-bus.c +0 -1
@@ -284,7 +284,6 @@ static int ps3_sb_free_mmio_region(struct ps3_mmio_region *r)int result;dump_mmio_region (r); -; result =lv1_unmap_device_mmio_region (r->dev->bus_id, r->dev->dev_id, r->lpar_addr);
arch/powerpc/sysdev/fsl_rio.c +1 -1
@@ -965,7 +965,7 @@ static inline void fsl_rio_info(struct device *dev, u32 ccsr)break ;default : str ="Unknown" ; -break ;; +break ; }dev_info (dev,"Hardware port width: %s\n" , str);
arch/powerpc/sysdev/ppc4xx_pci.c +2 -2
@@ -1531,7 +1531,7 @@ static void __init ppc4xx_configure_pciex_PIMs(struct ppc4xx_pciex_port *port,*/ /* Calculate window size */ - sa = (0xffffffffffffffffull <<ilog2 (ep_size));; + sa = (0xffffffffffffffffull <<ilog2 (ep_size));/* Setup BAR0 */ out_le32 (mbase +PECFG_BAR0HMPA ,RES_TO_U32_HIGH (sa));
@@ -1550,7 +1550,7 @@ static void __init ppc4xx_configure_pciex_PIMs(struct ppc4xx_pciex_port *port,out_le32 (mbase +PCI_BASE_ADDRESS_1 ,RES_TO_U32_HIGH (ep_addr)); }else {/* Calculate window size */ - sa = (0xffffffffffffffffull <<ilog2 (size));; + sa = (0xffffffffffffffffull <<ilog2 (size));if (res->flags &IORESOURCE_PREFETCH ) sa |=0x8 ;
arch/s390/hypfs/inode.c +1 -1
@@ -500,7 +500,7 @@ static int __init hypfs_init(void) } s390_kobj =kobject_create_and_add ("s390" , hypervisor_kobj);if (!s390_kobj) { - rc = -ENOMEM ;; + rc = -ENOMEM ; goto fail_sysfs; } rc =register_filesystem (&hypfs_type);
arch/s390/kvm/interrupt.c +1 -1
@@ -484,7 +484,7 @@ int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code)if (!inti)return -ENOMEM ; - inti->type =KVM_S390_PROGRAM_INT ;; + inti->type =KVM_S390_PROGRAM_INT ; inti->pgm.code = code;VCPU_EVENT (vcpu,3 ,"inject: program check %d (from kernel)" , code);
arch/sh/boards/mach-se/7206/io.c +1 -1
@@ -50,7 +50,7 @@ unsigned char se7206_inb_p(unsigned long port)unsigned short se7206_inw (unsigned long port) { -return *port2adr (port);; +return *port2adr (port); }void se7206_outb (unsigned char value,unsigned long port)
arch/sparc/kernel/irq_64.c +1 -1
@@ -229,7 +229,7 @@ static unsigned int sun4u_compute_tid(unsigned long imap, unsigned long cpuid) tid = ((a <<IMAP_AID_SHIFT ) | (n <<IMAP_NID_SHIFT )); tid &= (IMAP_AID_SAFARI | -IMAP_NID_SAFARI );; +IMAP_NID_SAFARI ); } }else { tid = cpuid <<IMAP_TID_SHIFT ;
arch/um/drivers/net_kern.c +1 -1
@@ -533,7 +533,7 @@ static int eth_parse(char *str, int *index_out, char **str_out, char **error_out) {char *end; -int n, err = -EINVAL ;; +int n, err = -EINVAL ; n =simple_strtoul (str, &end,0 );if (end == str) {
arch/x86/kernel/ds.c +1 -1
@@ -517,7 +517,7 @@ static inline unsigned long bts_get(const char *base, enum bts_field field)static inline void bts_set (char *base,enum bts_field field,unsigned long val) { - base += (ds_cfg.sizeof_ptr_field * field);; + base += (ds_cfg.sizeof_ptr_field * field); (*(unsigned long *)base) = val; }
drivers/ata/pata_octeon_cf.c +1 -1
@@ -213,7 +213,7 @@ static void octeon_cf_set_dmamode(struct ata_port *ap, struct ata_device *dev)* This is tI, C.F. spec. says 0, but Sony CF card requires * more, we use 20 nS. */ - dma_tim.s.dmack_s =ns_to_tim_reg (tim_mult,20 );; + dma_tim.s.dmack_s =ns_to_tim_reg (tim_mult,20 ); dma_tim.s.dmack_h =ns_to_tim_reg (tim_mult, dma_ackh); dma_tim.s.dmarq = dma_arq;
drivers/ata/sata_inic162x.c +1 -1
@@ -405,7 +405,7 @@ static irqreturn_t inic_interrupt(int irq, void *dev_instance)struct ata_host *host = dev_instance;struct inic_host_priv *hpriv = host->private_data;u16 host_irq_stat; -int i, handled =0 ;; +int i, handled =0 ; host_irq_stat =readw (hpriv->mmio_base +HOST_IRQ_STAT );
drivers/block/DAC960.c +2 -2
@@ -6652,7 +6652,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request,else ErrorCode =get_user (ControllerNumber, &UserSpaceControllerInfo->ControllerNumber);if (ErrorCode !=0 ) -break ;; +break ; ErrorCode = -ENXIO ;if (ControllerNumber <0 || ControllerNumber > DAC960_ControllerCount -1 ) {
@@ -6660,7 +6660,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request, } Controller = DAC960_Controllers[ControllerNumber];if (Controller ==NULL ) -break ;; +break ;memset (&ControllerInfo,0 ,sizeof (DAC960_ControllerInfo_T)); ControllerInfo.ControllerNumber = ControllerNumber; ControllerInfo.FirmwareType = Controller->FirmwareType;
drivers/block/swim3.c +1 -1
@@ -1062,7 +1062,7 @@ static int swim3_add_device(struct macio_dev *mdev, int index) goto out_release; } fs->swim3_intr =macio_irq (mdev,0 ); - fs->dma_intr =macio_irq (mdev,1 );; + fs->dma_intr =macio_irq (mdev,1 ); fs->cur_cyl =-1 ; fs->cur_sector =-1 ; fs->secpercyl =36 ;
drivers/char/epca.c +1 -1
@@ -2238,7 +2238,7 @@ static void do_softint(struct work_struct *work) struct channel *ch = container_of(work, struct channel, tqueue);/* Called in response to a modem change event */ if (ch && ch->magic ==EPCA_MAGIC ) { -struct tty_struct *tty =tty_port_tty_get (&ch->port);; +struct tty_struct *tty =tty_port_tty_get (&ch->port);if (tty && tty->driver_data) {if (test_and_clear_bit (EPCA_EVENT_HANGUP , &ch->event)) {
drivers/dma/dmatest.c +1 -1
@@ -114,7 +114,7 @@ static void dmatest_init_srcs(u8 **bufs, unsigned int start, unsigned int len) buf[i] =PATTERN_SRC | (~i &PATTERN_COUNT_MASK );for ( ; i < start + len; i++) buf[i] =PATTERN_SRC |PATTERN_COPY - | (~i &PATTERN_COUNT_MASK );; + | (~i &PATTERN_COUNT_MASK );for ( ; i < test_buf_size; i++) buf[i] =PATTERN_SRC | (~i &PATTERN_COUNT_MASK ); buf++;
drivers/dma/fsldma.c +1 -1
@@ -136,7 +136,7 @@ static int dma_is_idle(struct fsl_dma_chan *fsl_chan)static void dma_start (struct fsl_dma_chan *fsl_chan) { -u32 mr_set =0 ;; +u32 mr_set =0 ;if (fsl_chan->feature &FSL_DMA_CHAN_PAUSE_EXT ) {DMA_OUT (fsl_chan, &fsl_chan->reg_base->bcr,0 ,32 );
drivers/dma/mv_xor.c +1 -1
@@ -1176,7 +1176,7 @@ static int __devinit mv_xor_probe(struct platform_device *pdev)if (dma_has_cap (DMA_MEMSET , dma_dev->cap_mask)) dma_dev->device_prep_dma_memset = mv_xor_prep_dma_memset;if (dma_has_cap (DMA_XOR , dma_dev->cap_mask)) { - dma_dev->max_xor =8 ; ; + dma_dev->max_xor =8 ; dma_dev->device_prep_dma_xor = mv_xor_prep_dma_xor; }
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -211,7 +211,7 @@ intel_dp_aux_ch(struct intel_output *intel_output,for (try =0 ; try <5 ; try++) {/* Load the send data into the aux channel data registers */ for (i =0 ; i < send_bytes; i +=4 ) { -uint32_t d =pack_aux (send + i, send_bytes - i);; +uint32_t d =pack_aux (send + i, send_bytes - i);I915_WRITE (ch_data + i, d); }
drivers/gpu/drm/radeon/r300.c +2 -2
@@ -1276,11 +1276,11 @@ static int r300_packet0_check(struct radeon_cs_parser *p,case 0x443C :/* TX_FILTER0_[0-15] */ i = (reg -0x4400 ) >>2 ; - tmp = ib_chunk->kdata[idx] &0x7 ;; + tmp = ib_chunk->kdata[idx] &0x7 ;if (tmp ==2 || tmp ==4 || tmp ==6 ) { track->textures[i].roundup_w = false; } - tmp = (ib_chunk->kdata[idx] >>3 ) &0x7 ;; + tmp = (ib_chunk->kdata[idx] >>3 ) &0x7 ;if (tmp ==2 || tmp ==4 || tmp ==6 ) { track->textures[i].roundup_h = false; }
drivers/hwmon/sht15.c +1 -1
@@ -257,7 +257,7 @@ static inline int sht15_update_single_val(struct sht15_data *data, (data->flag ==SHT15_READING_NOTHING ), msecs_to_jiffies(timeout_msecs));if (ret ==0 ) {/* timeout occurred */ -disable_irq_nosync (gpio_to_irq (data->pdata->gpio_data));; +disable_irq_nosync (gpio_to_irq (data->pdata->gpio_data));sht15_connection_reset (data);return -ETIME ; }
drivers/ide/ide-probe.c +1 -1
@@ -1201,7 +1201,7 @@ static int ide_find_port_slot(const struct ide_port_info *d) {int idx = -ENOENT ;u8 bootable = (d && (d->host_flags &IDE_HFLAG_NON_BOOTABLE )) ?0 :1 ; -u8 i = (d && (d->host_flags &IDE_HFLAG_QD_2ND_PORT )) ?1 :0 ;; +u8 i = (d && (d->host_flags &IDE_HFLAG_QD_2ND_PORT )) ?1 :0 ;/* * Claim an unassigned slot.
drivers/ide/umc8672.c +2 -2
@@ -170,9 +170,9 @@ static int __init umc8672_init(void) goto out;if (umc8672_probe () ==0 ) -return 0 ;; +return 0 ; out: -return -ENODEV ;; +return -ENODEV ; }module_init (umc8672_init);
drivers/isdn/capi/capiutil.c +1 -1
@@ -1019,7 +1019,7 @@ int __init cdebug_init(void)if (!g_debbuf->buf) {kfree (g_cmsg);kfree (g_debbuf); -return -ENOMEM ;; +return -ENOMEM ; } g_debbuf->size =CDEBUG_GSIZE ; g_debbuf->buf[0 ] =0 ;
drivers/macintosh/rack-meter.c +1 -1
@@ -274,7 +274,7 @@ static void __devinit rackmeter_init_cpu_sniffer(struct rackmeter *rm)if (cpu >1 )continue ; - rcpu = &rm->cpu[cpu];; + rcpu = &rm->cpu[cpu]; rcpu->prev_idle =get_cpu_idle_time (cpu); rcpu->prev_wall =jiffies64_to_cputime64 (get_jiffies_64 ()); schedule_delayed_work_on(cpu, &rm->cpu[cpu].sniffer,
drivers/media/dvb/b2c2/flexcop-fe-tuner.c +1 -1
@@ -410,7 +410,7 @@ static int skystar2_rev28_attach(struct flexcop_device *fc,if (!fc->fe)return 0 ; - i2c_tuner =cx24123_get_tuner_i2c_adapter (fc->fe);; + i2c_tuner =cx24123_get_tuner_i2c_adapter (fc->fe);if (!i2c_tuner)return 0 ;
drivers/media/dvb/dvb-usb/dib0700_devices.c +1 -1
@@ -310,7 +310,7 @@ static int stk7700d_tuner_attach(struct dvb_usb_adapter *adap)struct i2c_adapter *tun_i2c; tun_i2c =dib7000p_get_i2c_master (adap->fe,DIBX000_I2C_INTERFACE_TUNER ,1 );return dvb_attach (mt2266_attach, adap->fe, tun_i2c, - &stk7700d_mt2266_config[adap->id]) ==NULL ? -ENODEV :0 ;; + &stk7700d_mt2266_config[adap->id]) ==NULL ? -ENODEV :0 ; }/* STK7700-PH: Digital/Analog Hybrid Tuner, e.h. Cinergy HT USB HE */
drivers/media/dvb/frontends/cx24123.c +1 -1
@@ -458,7 +458,7 @@ static int cx24123_set_symbolrate(struct cx24123_state *state, u32 srate)/* check if symbol rate is within limits */ if ((srate > state->frontend.ops.info.symbol_rate_max) || (srate < state->frontend.ops.info.symbol_rate_min)) -return -EOPNOTSUPP ;; +return -EOPNOTSUPP ;/* choose the sampling rate high enough for the required operation, while optimizing the power consumed by the demodulator */
drivers/media/dvb/frontends/dib0070.c +1 -1
@@ -167,7 +167,7 @@ static int dib0070_tune_digital(struct dvb_frontend *fe, struct dvb_frontend_parbreak ;case BAND_SBAND :LO4_SET_VCO_HFDIV (lo4,0 ,0 ); -LO4_SET_CTRIM (lo4,1 );; +LO4_SET_CTRIM (lo4,1 ); c =1 ;break ;case BAND_UHF :
drivers/media/dvb/frontends/stv0900_sw.c +1 -1
@@ -1721,7 +1721,7 @@ static enum fe_stv0900_signal_type stv0900_dvbs1_acq_workaround(struct dvb_fronts32 srate, demod_timeout, fec_timeout, freq1, freq0; -enum fe_stv0900_signal_type signal_type =STV0900_NODATA ;; +enum fe_stv0900_signal_type signal_type =STV0900_NODATA ;switch (demod) {case STV0900_DEMOD_1 :
drivers/media/video/cx18/cx18-fileops.c +1 -1
@@ -690,7 +690,7 @@ int cx18_v4l2_open(struct file *filp)int res;struct video_device *video_dev =video_devdata (filp);struct cx18_stream *s =video_get_drvdata (video_dev); -struct cx18 *cx = s->cx;; +struct cx18 *cx = s->cx;mutex_lock (&cx->serialize_lock);if (cx18_init_on_first_open (cx)) {
drivers/media/video/cx231xx/cx231xx-video.c +2 -2
@@ -923,8 +923,8 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, f->fmt.pix.width = dev->width; f->fmt.pix.height = dev->height; - f->fmt.pix.pixelformat = dev->format->fourcc;; - f->fmt.pix.bytesperline = (dev->width * dev->format->depth +7 ) >>3 ;; + f->fmt.pix.pixelformat = dev->format->fourcc; + f->fmt.pix.bytesperline = (dev->width * dev->format->depth +7 ) >>3 ; f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * dev->height; f->fmt.pix.colorspace =V4L2_COLORSPACE_SMPTE170M ;
drivers/media/video/cx23885/cx23885.h +1 -1
@@ -391,7 +391,7 @@ struct sram_channel {u32 cmds_start;u32 ctrl_start;u32 cdt; -u32 fifo_start;; +u32 fifo_start;u32 fifo_size;u32 ptr1_reg;u32 ptr2_reg;
drivers/media/video/ivtv/ivtv-driver.c +1 -1
@@ -218,7 +218,7 @@ MODULE_PARM_DESC(ivtv_yuv_mode, "\t\t\tDefault: 0 (interlaced)");MODULE_PARM_DESC (ivtv_yuv_threshold,"If ivtv_yuv_mode is 2 (auto) then playback content as\n\t\tprogressive if src height <= ivtv_yuvthreshold\n" -"\t\t\tDefault: 480" );; +"\t\t\tDefault: 480" );MODULE_PARM_DESC (enc_mpg_buffers,"Encoder MPG Buffers (in MB)\n" "\t\t\tDefault: " __stringify(IVTV_DEFAULT_ENC_MPG_BUFFERS ));
drivers/mfd/twl4030-irq.c +1 -1
@@ -441,7 +441,7 @@ static void twl4030_sih_do_edge(struct work_struct *work)/* see what work we have */ spin_lock_irq (&sih_agent_lock); edge_change = agent->edge_change; - agent->edge_change =0 ;; + agent->edge_change =0 ; sih = edge_change ? agent->sih :NULL ;spin_unlock_irq (&sih_agent_lock);if (!sih)
drivers/mmc/host/imxmmc.c +1 -1
@@ -652,7 +652,7 @@ static irqreturn_t imxmci_irq(int irq, void *devid)set_bit (IMXMCI_PEND_STARTED_b, &host->pending_events);tasklet_schedule (&host->tasklet); -return IRQ_RETVAL (handled);; +return IRQ_RETVAL (handled); }static void imxmci_tasklet_fnc (unsigned long data)
drivers/net/arcnet/arc-rawmode.c +0 -1
@@ -123,7 +123,6 @@ static void rx(struct net_device *dev, int bufnum, BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx"); skb->protocol = cpu_to_be16(ETH_P_ARCNET); -; netif_rx(skb); }
drivers/net/arcnet/capmode.c +0 -1
@@ -149,7 +149,6 @@ static void rx(struct net_device *dev, int bufnum, BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx"); skb->protocol = cpu_to_be16(ETH_P_ARCNET); -; netif_rx(skb); }
drivers/net/bnx2x_link.c +1 -1
@@ -2390,7 +2390,7 @@ static u8 bnx2x_read_sfp_module_eeprom(struct link_params *params, u16 addr, MDIO_PMA_REG_8726_TWO_WIRE_CTRL, &val);if ((val &MDIO_PMA_REG_8726_TWO_WIRE_CTRL_STATUS_MASK ) ==MDIO_PMA_REG_8726_TWO_WIRE_STATUS_IDLE ) -return 0 ;; +return 0 ;msleep (1 ); }return -EINVAL ;
drivers/net/gianfar_ethtool.c +1 -1
@@ -293,7 +293,7 @@ static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals rxtime =get_ictt_value (priv->rxic); rxcount =get_icft_value (priv->rxic); txtime =get_ictt_value (priv->txic); - txcount =get_icft_value (priv->txic);; + txcount =get_icft_value (priv->txic); cvals->rx_coalesce_usecs =gfar_ticks2usecs (priv, rxtime); cvals->rx_max_coalesced_frames = rxcount;
drivers/net/ibm_newemac/core.c +4 -4
@@ -2557,13 +2557,13 @@ static int __devinit emac_init_config(struct emac_instance *dev)if (emac_read_uint_prop (np,"mdio-device" , &dev->mdio_ph,0 )) dev->mdio_ph =0 ;if (emac_read_uint_prop (np,"zmii-device" , &dev->zmii_ph,0 )) - dev->zmii_ph =0 ;; + dev->zmii_ph =0 ;if (emac_read_uint_prop (np,"zmii-channel" , &dev->zmii_port,0 )) - dev->zmii_port =0xffffffff ;; + dev->zmii_port =0xffffffff ;if (emac_read_uint_prop (np,"rgmii-device" , &dev->rgmii_ph,0 )) - dev->rgmii_ph =0 ;; + dev->rgmii_ph =0 ;if (emac_read_uint_prop (np,"rgmii-channel" , &dev->rgmii_port,0 )) - dev->rgmii_port =0xffffffff ;; + dev->rgmii_port =0xffffffff ;if (emac_read_uint_prop (np,"fifo-entry-size" , &dev->fifo_entry_size,0 )) dev->fifo_entry_size =16 ;if (emac_read_uint_prop (np,"mal-burst-size" , &dev->mal_burst_size,0 ))
drivers/net/igb/igb_main.c +2 -2
@@ -3901,7 +3901,7 @@ static int igb_set_vf_multicasts(struct igb_adapter *adapter,/* VFs are limited to using the MTA hash table for their multicast * addresses */ for (i =0 ; i < n; i++) - vf_data->vf_mc_hashes[i] = hash_list[i];; + vf_data->vf_mc_hashes[i] = hash_list[i];/* Flush and reset the mta with the new values */ igb_set_multi (adapter->netdev);
@@ -5447,7 +5447,7 @@ static inline void igb_set_rah_pool(struct e1000_hw *hw, int pool, int entry) reg_data =rd32 (E1000_RAH (entry)); reg_data &= ~E1000_RAH_POOL_MASK ; - reg_data |=E1000_RAH_POOL_1 << pool;; + reg_data |=E1000_RAH_POOL_1 << pool;wr32 (E1000_RAH (entry), reg_data); }
drivers/net/ll_temac_main.c +1 -1
@@ -865,7 +865,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match) dcrs =dcr_resource_start (np,0 );if (dcrs ==0 ) {dev_err (&op->dev,"could not get DMA register address\n" ); - goto nodev;; + goto nodev; } lp->sdma_dcrs =dcr_map (np, dcrs,dcr_resource_len (np,0 ));dev_dbg (&op->dev,"DCR base: %x\n" , dcrs);
drivers/net/ni52.c +2 -2
@@ -615,10 +615,10 @@ static int init586(struct net_device *dev)/* addr_len |!src_insert |pre-len |loopback */ writeb (0x2e , &cfg_cmd->adr_len);writeb (0x00 , &cfg_cmd->priority); -writeb (0x60 , &cfg_cmd->ifs);; +writeb (0x60 , &cfg_cmd->ifs);writeb (0x00 , &cfg_cmd->time_low);writeb (0xf2 , &cfg_cmd->time_high); -writeb (0x00 , &cfg_cmd->promisc);; +writeb (0x00 , &cfg_cmd->promisc);if (dev->flags &IFF_ALLMULTI ) {int len = ((char __iomem *)p->iscp - (char __iomem *)ptr -8 ) /6 ;if (num_addrs > len) {
drivers/net/qlge/qlge_main.c +2 -2
@@ -2607,7 +2607,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)FLAGS_LI ;/* Load irq delay values */ if (rx_ring->lbq_len) { cqicb->flags |=FLAGS_LL ;/* Load lbq values */ - tmp = (u64 )rx_ring->lbq_base_dma;; + tmp = (u64 )rx_ring->lbq_base_dma; base_indirect_ptr = (__le64 *) rx_ring->lbq_base_indirect; page_entries =0 ; do {
@@ -2631,7 +2631,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring) }if (rx_ring->sbq_len) { cqicb->flags |=FLAGS_LS ;/* Load sbq values */ - tmp = (u64 )rx_ring->sbq_base_dma;; + tmp = (u64 )rx_ring->sbq_base_dma; base_indirect_ptr = (__le64 *) rx_ring->sbq_base_indirect; page_entries =0 ; do {
drivers/net/skfp/pcmplc.c +1 -1
@@ -960,7 +960,7 @@ static void pcm_fsm(struct s_smc *smc, struct s_phy *phy, int cmd)/*PC88b*/ if (!phy->cf_join) { phy->cf_join = TRUE ; -queue_event (smc,EVENT_CFM ,CF_JOIN +np) ; ; +queue_event (smc,EVENT_CFM ,CF_JOIN +np) ; }if (cmd ==PC_JOIN )GO_STATE (PC8_ACTIVE ) ;
drivers/net/skfp/pmf.c +4 -4
@@ -807,9 +807,9 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para, mib_p->fddiPORTLerFlag ; sp->p4050_pad =0 ; sp->p4050_cutoff = - mib_p->fddiPORTLer_Cutoff ; ; + mib_p->fddiPORTLer_Cutoff ; sp->p4050_alarm = - mib_p->fddiPORTLer_Alarm ; ; + mib_p->fddiPORTLer_Alarm ; sp->p4050_estimate = mib_p->fddiPORTLer_Estimate ; sp->p4050_reject_ct =
@@ -829,7 +829,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para, sp->p4051_porttype = mib_p->fddiPORTMy_Type ; sp->p4051_connectstate = - mib_p->fddiPORTConnectState ; ; + mib_p->fddiPORTConnectState ; sp->p4051_pc_neighbor = mib_p->fddiPORTNeighborType ; sp->p4051_pc_withhold =
@@ -853,7 +853,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,struct smt_p_4053 *sp ; sp = (struct smt_p_4053 *) to ; sp->p4053_multiple = - mib_p->fddiPORTMultiple_P ; ; + mib_p->fddiPORTMultiple_P ; sp->p4053_availablepaths = mib_p->fddiPORTAvailablePaths ; sp->p4053_currentpath =
drivers/net/skge.c +1 -1
@@ -215,7 +215,7 @@ static void skge_wol_init(struct skge_port *skge)if (skge->wol &WAKE_MAGIC ) ctrl |=WOL_CTL_ENA_PME_ON_MAGIC_PKT |WOL_CTL_ENA_MAGIC_PKT_UNIT ;else - ctrl |=WOL_CTL_DIS_PME_ON_MAGIC_PKT |WOL_CTL_DIS_MAGIC_PKT_UNIT ;; + ctrl |=WOL_CTL_DIS_PME_ON_MAGIC_PKT |WOL_CTL_DIS_MAGIC_PKT_UNIT ; ctrl |=WOL_CTL_DIS_PME_ON_PATTERN |WOL_CTL_DIS_PATTERN_UNIT ;skge_write16 (hw,WOL_REGS (port,WOL_CTRL_STAT ), ctrl);
drivers/net/sky2.c +1 -1
@@ -749,7 +749,7 @@ static void sky2_wol_init(struct sky2_port *sky2)if (sky2->wol &WAKE_MAGIC ) ctrl |=WOL_CTL_ENA_PME_ON_MAGIC_PKT |WOL_CTL_ENA_MAGIC_PKT_UNIT ;else - ctrl |=WOL_CTL_DIS_PME_ON_MAGIC_PKT |WOL_CTL_DIS_MAGIC_PKT_UNIT ;; + ctrl |=WOL_CTL_DIS_PME_ON_MAGIC_PKT |WOL_CTL_DIS_MAGIC_PKT_UNIT ; ctrl |=WOL_CTL_DIS_PME_ON_PATTERN |WOL_CTL_DIS_PATTERN_UNIT ;sky2_write16 (hw,WOL_REGS (port,WOL_CTRL_STAT ), ctrl);
drivers/net/vxge/vxge-config.h +1 -1
@@ -1547,7 +1547,7 @@ void vxge_hw_ring_rxd_1b_info_get( rxd_info->l4_cksum_valid = (u32 )VXGE_HW_RING_RXD_L4_CKSUM_CORRECT_GET (rxdp->control_0); rxd_info->l4_cksum = - (u32 )VXGE_HW_RING_RXD_L4_CKSUM_GET (rxdp->control_0);; + (u32 )VXGE_HW_RING_RXD_L4_CKSUM_GET (rxdp->control_0); rxd_info->frame = (u32 )VXGE_HW_RING_RXD_ETHER_ENCAP_GET (rxdp->control_0); rxd_info->proto =
drivers/net/vxge/vxge-main.c +1 -1
@@ -2341,7 +2341,7 @@ static int vxge_enable_msix(struct vxgedev *vdev)enum vxge_hw_status status;/* 0 - Tx, 1 - Rx */ int tim_msix_id[4 ]; -int alarm_msix_id =0 , msix_intr_vect =0 ;; +int alarm_msix_id =0 , msix_intr_vect =0 ; vdev->intr_cnt =0 ;/* allocate msix vectors */
drivers/net/wireless/ath/ath9k/eeprom.c +0 -2
@@ -2516,10 +2516,8 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah, targetPowerCck.tPow2x[1 ]; ratesArray[rate5_5s] = ratesArray[rate5_5l] = targetPowerCck.tPow2x[2 ]; - ; ratesArray[rate11s] = ratesArray[rate11l] = targetPowerCck.tPow2x[3 ]; - ; }if (IS_CHAN_HT40 (chan)) {for (i =0 ; i <ARRAY_SIZE (targetPowerHt40.tPow2x); i++) {
drivers/net/wireless/ath/ath9k/hw.c +1 -1
@@ -2345,7 +2345,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,ath9k_hw_init_bb (ah, chan);if (!ath9k_hw_init_cal (ah, chan)) -return -EIO ;; +return -EIO ; rx_chainmask = ah->rxchainmask;if ((rx_chainmask ==0x5 ) || (rx_chainmask ==0x3 )) {
drivers/net/wireless/iwmc3200wifi/rx.c +4 -4
@@ -779,16 +779,16 @@ static int iwm_mlme_mgt_frame(struct iwm_priv *iwm, u8 *buf, le16_to_cpu(mgt_frame->len));if (ieee80211_is_assoc_req (mgt->frame_control)) { - ie = mgt->u.assoc_req.variable;; + ie = mgt->u.assoc_req.variable; event =IWEVASSOCREQIE ; }else if (ieee80211_is_reassoc_req (mgt->frame_control)) { - ie = mgt->u.reassoc_req.variable;; + ie = mgt->u.reassoc_req.variable; event =IWEVASSOCREQIE ; }else if (ieee80211_is_assoc_resp (mgt->frame_control)) { - ie = mgt->u.assoc_resp.variable;; + ie = mgt->u.assoc_resp.variable; event =IWEVASSOCRESPIE ; }else if (ieee80211_is_reassoc_resp (mgt->frame_control)) { - ie = mgt->u.reassoc_resp.variable;; + ie = mgt->u.reassoc_resp.variable; event =IWEVASSOCRESPIE ; }else {IWM_ERR (iwm,"Unsupported management frame" );
drivers/pci/pcie/aer/ecrc.c +1 -1
@@ -106,7 +106,7 @@ void pcie_set_ecrc_checking(struct pci_dev *dev)disable_ecrc_checking (dev);break ;case ECRC_POLICY_ON : -enable_ecrc_checking (dev);; +enable_ecrc_checking (dev);break ;default :return ;
drivers/pcmcia/pcmcia_resource.c +1 -1
@@ -489,7 +489,7 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,pccard_io_map iomap;if (!(s->state &SOCKET_PRESENT )) -return -ENODEV ;; +return -ENODEV ;if (req->IntType &INT_CARDBUS ) {ds_dbg (p_dev->socket,0 ,"IntType may not be INT_CARDBUS\n" );
drivers/regulator/pcf50633-regulator.c +1 -1
@@ -155,7 +155,7 @@ static int pcf50633_regulator_get_voltage(struct regulator_dev *rdev)int regulator_id, millivolts, volt_bits;u8 regnr; - pcf =rdev_get_drvdata (rdev);; + pcf =rdev_get_drvdata (rdev); regulator_id =rdev_get_id (rdev);if (regulator_id >=PCF50633_NUM_REGULATORS )
drivers/rtc/rtc-omap.c +1 -1
@@ -430,7 +430,7 @@ fail: static int __exit omap_rtc_remove(struct platform_device *pdev) { -struct rtc_device *rtc =platform_get_drvdata (pdev);; +struct rtc_device *rtc =platform_get_drvdata (pdev);device_init_wakeup (&pdev->dev,0 );
drivers/s390/block/dasd_eckd.c +1 -1
@@ -706,7 +706,7 @@ static int dasd_eckd_generate_uid(struct dasd_device *device, sizeof(uid->serial) - 1);EBCASC (uid->serial,sizeof (uid->serial) -1 ); uid->ssid = private->gneq->subsystemID; - uid->real_unit_addr = private->ned->unit_addr;; + uid->real_unit_addr = private->ned->unit_addr;if (private->sneq) { uid->type = private->sneq->sua_flags;if (uid->type ==UA_BASE_PAV_ALIAS )
drivers/s390/net/netiucv.c +1 -1
@@ -2113,7 +2113,7 @@ static ssize_t remove_write (struct device_driver *drv,IUCV_DBF_TEXT (trace,3 , __func__);if (count >=IFNAMSIZ ) - count =IFNAMSIZ -1 ;; + count =IFNAMSIZ -1 ;for (i =0 , p = buf; i < count && *p; i++, p++) {if (*p =='\n' || *p ==' ' )
drivers/s390/scsi/zfcp_scsi.c +1 -1
@@ -101,7 +101,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt,if (unlikely ((status &ZFCP_STATUS_COMMON_ERP_FAILED ) || !(status &ZFCP_STATUS_COMMON_RUNNING ))) {zfcp_scsi_command_fail (scpnt,DID_ERROR ); -return 0 ;; +return 0 ; } ret =zfcp_fsf_send_fcp_command_task (unit, scpnt);
drivers/scsi/bnx2i/bnx2i_hwi.c +1 -1
@@ -1340,7 +1340,7 @@ static int bnx2i_process_login_resp(struct iscsi_session *session, resp_hdr->opcode = login->op_code; resp_hdr->flags = login->response_flags; resp_hdr->max_version = login->version_max; - resp_hdr->active_version = login->version_active;; + resp_hdr->active_version = login->version_active; resp_hdr->hlength =0 ;hton24 (resp_hdr->dlength, login->data_length);
drivers/scsi/lpfc/lpfc_ct.c +1 -1
@@ -1205,7 +1205,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode, vport->ct_flags &= ~FC_CT_RFF_ID ; CtReq->CommandResponse.bits.CmdRsp =be16_to_cpu (SLI_CTNS_RFF_ID ); - CtReq->un.rff.PortId =cpu_to_be32 (vport->fc_myDID);; + CtReq->un.rff.PortId =cpu_to_be32 (vport->fc_myDID); CtReq->un.rff.fbits =FC4_FEATURE_INIT ; CtReq->un.rff.type_code =FC_FCP_DATA ; cmpl = lpfc_cmpl_ct_cmd_rff_id;
drivers/spi/omap_uwire.c +1 -1
@@ -213,7 +213,7 @@ static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t)unsigned bits = ust->bits_per_word;unsigned bytes;u16 val, w; -int status =0 ;; +int status =0 ;if (!t->tx_buf && !t->rx_buf)return 0 ;
drivers/spi/spi_s3c24xx.c +1 -1
@@ -385,7 +385,7 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev) err_no_iores: err_no_pdata: -spi_master_put (hw->master);; +spi_master_put (hw->master); err_nomem:return err;
drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c +1 -1
@@ -1008,7 +1008,7 @@ int i_APCI1710_InsnWriteEnableDisableTorCounter(struct comedi_device *dev, b_ExternGate = (unsigned char ) data[3 ]; b_CycleMode = (unsigned char ) data[4 ]; b_InterruptEnable = (unsigned char ) data[5 ]; - i_ReturnValue = insn->n;; + i_ReturnValue = insn->n; devpriv->tsk_Current = current;/* Save the current process task structure */ /**************************/ /* Test the module number */
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c +1 -1
@@ -2834,7 +2834,7 @@ int i_APCI1500_Reset(struct comedi_device *dev) i_Logic =0 ; i_CounterLogic =0 ; i_InterruptMask =0 ; - i_InputChannel =0 ;; + i_InputChannel =0 ; i_TimerCounter1Enabled =0 ; i_TimerCounter2Enabled =0 ; i_WatchdogCounter3Enabled =0 ;
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c +1 -1
@@ -335,7 +335,7 @@ int i_APCI1516_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subdereturn -EINVAL ; }/* if else data[3]==1) */ }/* if else data[3]==0) */ -return (insn->n);; +return (insn->n); }/*
drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c +1 -1
@@ -339,7 +339,7 @@ int i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev, struct comedi_subdeint i_APCI3501_WriteAnalogOutput (struct comedi_device *dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) { -unsigned int ul_Command1 =0 , ul_Channel_no, ul_Polarity, ul_DAC_Ready =0 ;; +unsigned int ul_Command1 =0 , ul_Channel_no, ul_Polarity, ul_DAC_Ready =0 ; ul_Channel_no =CR_CHAN (insn->chanspec);
drivers/staging/comedi/drivers/amplc_pci230.c +1 -1
@@ -918,7 +918,7 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)if (thisboard->ao_chans >0 ) { s->type =COMEDI_SUBD_AO ; s->subdev_flags =SDF_WRITABLE |SDF_GROUND ; - s->n_chan = thisboard->ao_chans;; + s->n_chan = thisboard->ao_chans; s->maxdata = (1 << thisboard->ao_bits) -1 ; s->range_table = &pci230_ao_range; s->insn_write = &pci230_ao_winsn;
drivers/staging/comedi/drivers/comedi_bond.c +1 -1
@@ -400,7 +400,7 @@ static int doDevConfig(struct comedi_device *dev, struct comedi_devconfig *it)void *devs_opened[COMEDI_NUM_BOARD_MINORS ];memset (devs_opened,0 ,sizeof (devs_opened)); - devpriv->name[0 ] =0 ;; + devpriv->name[0 ] =0 ;/* Loop through all comedi devices specified on the command-line, building our device list */ for (i =0 ; i <COMEDI_NDEVCONFOPTS && (!i || it->options[i]); ++i) {
drivers/staging/go7007/go7007-driver.c +1 -1
@@ -647,7 +647,7 @@ struct go7007 *go7007_alloc(struct go7007_board_info *board, struct device *dev) go->dvd_mode =0 ; go->interlace_coding =0 ;for (i =0 ; i <4 ; ++i) - go->modet[i].enable =0 ;; + go->modet[i].enable =0 ;for (i =0 ; i <1624 ; ++i) go->modet_map[i] =0 ; go->audio_deliver =NULL ;
drivers/staging/otus/80211core/cmmsta.c +1 -1
@@ -1426,7 +1426,7 @@ struct zsBssInfo* zfStaFindBssInfo(zdev_t* dev, zbuf_t* buf, struct zsWlanProbeRif (zfHpIsAllowedChannel (dev,zfChNumToFreq (dev, channel,0 )) ==0 ) { frequency =0 ; }else { - frequency =zfChNumToFreq (dev, channel,0 );; + frequency =zfChNumToFreq (dev, channel,0 ); } }else { frequency =0 ;
drivers/staging/otus/hal/hpmain.c +1 -1
@@ -1455,7 +1455,7 @@ void zfHpSetFrequencyEx(zdev_t* dev, u32_t frequency, u8_t bw40,/* calibration that updates the pddac with the wrong polarity. Fortunately */ /* the second loop can be disabled with a bit called en_pd_dc_offset_thr. */ #if 0 - cmdB[0 ] =8 | (ZM_CMD_BITAND <<8 );; + cmdB[0 ] =8 | (ZM_CMD_BITAND <<8 ); cmdB[1 ] = (0xa27c +0x1bc000 ); cmdB[2 ] =0xffefffff ; ret =zfIssueCmd (dev, cmdB,12 ,ZM_OID_INTERNAL_WRITE ,0 );
drivers/staging/rt2860/common/cmm_data_2860.c +4 -4
@@ -80,7 +80,7 @@ USHORT RtmpPCI_WriteTxResource( pTxD->SDPtr0 = BufBasePaLow; pTxD->SDLen0 =TXINFO_SIZE +TXWI_SIZE + hwHeaderLen;// include padding - pTxD->SDPtr1 =PCI_MAP_SINGLE (pAd, pTxBlk,0 ,1 ,PCI_DMA_TODEVICE );; + pTxD->SDPtr1 =PCI_MAP_SINGLE (pAd, pTxBlk,0 ,1 ,PCI_DMA_TODEVICE ); pTxD->SDLen1 = pTxBlk->SrcBufLen; pTxD->LastSec0 =0 ; pTxD->LastSec1 = (bIsLast) ?1 :0 ;
@@ -139,7 +139,7 @@ USHORT RtmpPCI_WriteSingleTxResource( pTxD->SDPtr0 = BufBasePaLow; pTxD->SDLen0 =TXINFO_SIZE +TXWI_SIZE + hwHeaderLen;// include padding - pTxD->SDPtr1 =PCI_MAP_SINGLE (pAd, pTxBlk,0 ,1 ,PCI_DMA_TODEVICE );; + pTxD->SDPtr1 =PCI_MAP_SINGLE (pAd, pTxBlk,0 ,1 ,PCI_DMA_TODEVICE ); pTxD->SDLen1 = pTxBlk->SrcBufLen; pTxD->LastSec0 =0 ; pTxD->LastSec1 = (bIsLast) ?1 :0 ;
@@ -218,7 +218,7 @@ USHORT RtmpPCI_WriteMultiTxResource( pTxD->SDPtr0 = BufBasePaLow; pTxD->SDLen0 = firstDMALen;// include padding - pTxD->SDPtr1 =PCI_MAP_SINGLE (pAd, pTxBlk,0 ,1 ,PCI_DMA_TODEVICE );; + pTxD->SDPtr1 =PCI_MAP_SINGLE (pAd, pTxBlk,0 ,1 ,PCI_DMA_TODEVICE ); pTxD->SDLen1 = pTxBlk->SrcBufLen; pTxD->LastSec0 =0 ; pTxD->LastSec1 = (bIsLast) ?1 :0 ;
@@ -372,7 +372,7 @@ int RtmpPCIMgmtKickOut( pTxD->LastSec1 =1 ; pTxD->DMADONE =0 ; pTxD->SDLen1 =0 ; - pTxD->SDPtr0 =PCI_MAP_SINGLE (pAd, pSrcBufVA, SrcBufLen,0 ,PCI_DMA_TODEVICE );; + pTxD->SDPtr0 =PCI_MAP_SINGLE (pAd, pSrcBufVA, SrcBufLen,0 ,PCI_DMA_TODEVICE ); pTxD->SDLen0 = SrcBufLen; pAd->RalinkCounters.KickTxCount++;
drivers/staging/rt2860/rt_linux.c +1 -1
@@ -934,7 +934,7 @@ void send_monitor_packets( ph->rssi.did = DIDmsg_lnxind_wlansniffrm_rssi; ph->rssi.status =0 ; ph->rssi.len =4 ; - ph->rssi.data = (u_int32_t )RTMPMaxRssi (pAd,ConvertToRssi (pAd, pRxBlk->pRxWI->RSSI0,RSSI_0 ),ConvertToRssi (pAd, pRxBlk->pRxWI->RSSI1,RSSI_1 ),ConvertToRssi (pAd, pRxBlk->pRxWI->RSSI2,RSSI_2 ));; + ph->rssi.data = (u_int32_t )RTMPMaxRssi (pAd,ConvertToRssi (pAd, pRxBlk->pRxWI->RSSI0,RSSI_0 ),ConvertToRssi (pAd, pRxBlk->pRxWI->RSSI1,RSSI_1 ),ConvertToRssi (pAd, pRxBlk->pRxWI->RSSI2,RSSI_2 )); ph->signal.did = DIDmsg_lnxind_wlansniffrm_signal; ph->signal.status =0 ;
drivers/staging/rt2860/rtmp.h +1 -2
@@ -4507,8 +4507,7 @@ VOID IterateOnBssTab( IN PRTMP_ADAPTER pAd);VOID IterateOnBssTab2 ( - IN PRTMP_ADAPTER pAd);; - + IN PRTMP_ADAPTER pAd); VOID JoinParmFill( IN PRTMP_ADAPTER pAd, IN OUT MLME_JOIN_REQ_STRUCT *JoinReq,
drivers/staging/rt2860/sta/aironet.c +1 -1
@@ -367,7 +367,7 @@ VOID ChannelLoadRequestAction(if (NStatus !=NDIS_STATUS_SUCCESS )return ; - pNullFrame = (PHEADER_802_11 ) pOutBuffer;; + pNullFrame = (PHEADER_802_11 ) pOutBuffer;// Make the power save Null frame with PSM bit on MgtMacHeaderInit (pAd, pNullFrame,SUBTYPE_NULL_FUNC ,1 , pAd->CommonCfg.Bssid, pAd->CommonCfg.Bssid); pNullFrame->Duration =0 ;
drivers/staging/rtl8187se/r8185b_init.c +1 -1
@@ -2642,7 +2642,7 @@ SetRFPowerState(default :printk ("SetRFPowerState8185(): unknown RFChipID: 0x%X!!!\n" , priv->rf_chip); -break ;; +break ; }// printk("<--------- SetRFPowerState(): bResult(%d)\n", bResult);
drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c +1 -1
@@ -788,7 +788,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) { txb->queue_index =UP2AC (skb->priority); } else { - txb->queue_index =WME_AC_BK ;; + txb->queue_index =WME_AC_BK ; }
drivers/staging/rtl8192su/r8192U_core.c +3 -3
@@ -7454,7 +7454,7 @@ static void rtl8192SU_MacConfigBeforeFwDownloadASIC(struct net_device *dev)void rtl8192SU_HalUsbRxAggr8192SUsb (struct net_device *dev,bool Value) {struct r8192_priv *priv =ieee80211_priv ((struct net_device *)dev); -PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo;; +PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo;//
@@ -7527,7 +7527,7 @@ void rtl8192SU_HalUsbRxAggr8192SUsb(struct net_device *dev, bool Value)void rtl8192SU_HalUsbRxAggr8192SUsb (struct net_device *dev,bool Value) {struct r8192_priv *priv =ieee80211_priv ((struct net_device *)dev); -PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo;; +PRT_HIGH_THROUGHPUT pHTInfo = priv->ieee80211->pHTInfo;//
@@ -10688,7 +10688,7 @@ static void rtl8192_query_rxphystatus(//Get Rx snr value in DB tmp_rxsnr = pofdm_buf->rxsnr_X[i]; rx_snrX = (char )(tmp_rxsnr); -//rx_snrX >>= 1;; +//rx_snrX >>= 1; rx_snrX /=2 ; priv->stats.rxSNRdB[i] = (long )rx_snrX;
drivers/staging/rtl8192su/r819xU_phy.c +1 -1
@@ -1011,7 +1011,7 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device* dev, RF90_RADIO_PATH_Ebreak ; } -return ret;; +return ret; }/******************************************************************************
drivers/staging/vt6655/card.c +1 -1
@@ -2960,7 +2960,7 @@ BOOL CARDbSoftwareReset (PVOID pDeviceHandler)QWORD CARDqGetTSFOffset (BYTE byRxRate,QWORD qwTSF1,QWORD qwTSF2) {QWORD qwTSFOffset; -WORD wRxBcnTSFOffst=0 ;; +WORD wRxBcnTSFOffst=0 ;HIDWORD (qwTSFOffset) =0 ;LODWORD (qwTSFOffset) =0 ;
drivers/staging/vt6655/iwctl.c +1 -1
@@ -2168,7 +2168,7 @@ int iwctl_giwencodeext(struct net_device *dev,struct iw_point *wrq, char *extra) { - return -EOPNOTSUPP;; + return -EOPNOTSUPP; } int iwctl_siwmlme(struct net_device *dev,
drivers/staging/vt6655/wpa2.c +2 -2
@@ -225,7 +225,7 @@ WPA2vParseRSN ( m = *((PWORD ) &(pRSN->abyRSN[4 ]));if (pRSN->len >=10 +m*4 ) {// ver(2) + GK(4) + PK count(2) + PKS(4*m) + AKMSS count(2) - pBSSNode->wAKMSSAuthCount = *((PWORD ) &(pRSN->abyRSN[6 +4 *m]));; + pBSSNode->wAKMSSAuthCount = *((PWORD ) &(pRSN->abyRSN[6 +4 *m])); j =0 ; pbyOUI = &(pRSN->abyRSN[8 +4 *m]);for (i =0 ; (i < pBSSNode->wAKMSSAuthCount) && (j <sizeof (pBSSNode->abyAKMSSAuthType)/sizeof (BYTE )); i++) {
@@ -244,7 +244,7 @@ WPA2vParseRSN ( pBSSNode->wAKMSSAuthCount = (WORD )j;DEVICE_PRT (MSG_LEVEL_DEBUG ,KERN_INFO "wAKMSSAuthCount: %d\n" , pBSSNode->wAKMSSAuthCount); - n = *((PWORD ) &(pRSN->abyRSN[6 +4 *m]));; + n = *((PWORD ) &(pRSN->abyRSN[6 +4 *m]));if (pRSN->len >=12 +4 *m+4 *n) {// ver(2)+GK(4)+PKCnt(2)+PKS(4*m)+AKMSSCnt(2)+AKMSS(4*n)+Cap(2) pBSSNode->sRSNCapObj.bRSNCapExist = TRUE; pBSSNode->sRSNCapObj.wRSNCap = *((PWORD ) &(pRSN->abyRSN[8 +4 *m+4 *n]));
drivers/usb/class/cdc-wdm.c +0 -2
@@ -507,8 +507,6 @@ static int wdm_open(struct inode *inode, struct file *file) desc =usb_get_intfdata (intf);if (test_bit (WDM_DISCONNECTING , &desc->flags)) goto out; - - ; file->private_data = desc; rv =usb_autopm_get_interface (desc->intf);
drivers/usb/serial/spcp8x5.c +1 -1
@@ -546,7 +546,7 @@ static void spcp8x5_set_termios(struct tty_struct *tty, }/* Set Baud Rate */ - baud =tty_get_baud_rate (tty);; + baud =tty_get_baud_rate (tty);switch (baud) {case 300 : buf[0 ] =0x00 ;break ;case 600 : buf[0 ] =0x01 ;break ;
drivers/uwb/i1480/i1480u-wlp/netdev.c +1 -1
@@ -214,7 +214,7 @@ int i1480u_open(struct net_device *net_dev)netif_wake_queue (net_dev);#ifdef i1480u_FLOW_CONTROL - result =usb_submit_urb (i1480u->notif_urb,GFP_KERNEL );; + result =usb_submit_urb (i1480u->notif_urb,GFP_KERNEL );if (result <0 ) {dev_err (dev,"Can't submit notification URB: %d\n" , result); goto error_notif_urb_submit;
drivers/video/cfbcopyarea.c +1 -1
@@ -114,7 +114,7 @@ bitcpy(struct fb_info *p, unsigned long __iomem *dst, int dst_idx, d0 >>= right; }else if (src_idx+n <= bits) {// Single source word - d0 <<= left;; + d0 <<= left; }else {// 2 source words d1 =FB_READL (src +1 );
drivers/video/imxfb.c +1 -1
@@ -677,7 +677,7 @@ static int __init imxfb_probe(struct platform_device *pdev) fbi->clk =clk_get (&pdev->dev,NULL );if (IS_ERR (fbi->clk)) { - ret =PTR_ERR (fbi->clk);; + ret =PTR_ERR (fbi->clk);dev_err (&pdev->dev,"unable to get clock: %d\n" , ret); goto failed_getclock; }
drivers/video/s3c2410fb.c +1 -1
@@ -1119,7 +1119,7 @@ int __init s3c2410fb_init(void)int ret =platform_driver_register (&s3c2410fb_driver);if (ret ==0 ) - ret =platform_driver_register (&s3c2412fb_driver);; + ret =platform_driver_register (&s3c2412fb_driver);return ret; }
drivers/watchdog/bcm47xx_wdt.c +1 -1
@@ -161,7 +161,7 @@ static long bcm47xx_wdt_ioctl(struct file *file, {void __user *argp = (void __user *)arg;int __user *p = argp; -int new_value, retval = -EINVAL ;; +int new_value, retval = -EINVAL ;switch (cmd) {case WDIOC_GETSUPPORT :
drivers/xen/balloon.c +1 -1
@@ -214,7 +214,7 @@ static int increase_reservation(unsigned long nr_pages) page =balloon_first_page ();for (i =0 ; i < nr_pages; i++) {BUG_ON (page ==NULL ); - frame_list[i] =page_to_pfn (page);; + frame_list[i] =page_to_pfn (page); page =balloon_next_page (page); }
fs/autofs/dirhash.c +1 -1
@@ -90,7 +90,7 @@ struct autofs_dir_ent *autofs_expire(struct super_block *sb,DPRINTK (("autofs: not expirable (not a mounted directory): %s\n" , ent->name));continue ; } -while (d_mountpoint (path.dentry) &&follow_down (&path)); +while (d_mountpoint (path.dentry) &&follow_down (&path)) ; umount_ok =may_umount (path.mnt);path_put (&path);
fs/btrfs/tree-log.c +1 -1
@@ -2605,7 +2605,7 @@ static noinline int copy_items(struct btrfs_trans_handle *trans, extent); cs =btrfs_file_extent_offset (src, extent); cl =btrfs_file_extent_num_bytes (src, - extent);; + extent);if (btrfs_file_extent_compression (src, extent)) { cs =0 ;
fs/cifs/cifs_dfs_ref.c +1 -1
@@ -136,7 +136,7 @@ char *cifs_compose_mount_options(const char *sb_mountdata, rc =dns_resolve_server_name_to_ip (*devname, &srvIP);if (rc !=0 ) {cERROR (1 , ("%s: Failed to resolve server part of %s to IP: %d" , - __func__, *devname, rc));; + __func__, *devname, rc)); goto compose_mount_options_err; }/* md_len = strlen(...) + 12 for 'sep+prefixpath='
fs/ext4/mballoc.c +1 -1
@@ -2525,7 +2525,7 @@ int ext4_mb_add_groupinfo(struct super_block *sb, ext4_group_t group,INIT_LIST_HEAD (&meta_group_info[i]->bb_prealloc_list);init_rwsem (&meta_group_info[i]->alloc_sem); - meta_group_info[i]->bb_free_root.rb_node =NULL ;; + meta_group_info[i]->bb_free_root.rb_node =NULL ;#ifdef DOUBLE_CHECK {
fs/nfs/callback_xdr.c +1 -1
@@ -222,7 +222,7 @@ static unsigned decode_sessionid(struct xdr_stream *xdr, p =read_buf (xdr, len);if (unlikely (p ==NULL )) -return htonl (NFS4ERR_RESOURCE );; +return htonl (NFS4ERR_RESOURCE );memcpy (sid->data, p, len);return 0 ;
fs/ocfs2/quota_global.c +1 -1
@@ -143,7 +143,7 @@ static int ocfs2_get_quota_block(struct inode *inode, int block, err = -EIO ;mlog_errno (err); } -return err;; +return err; }/* Read data from global quotafile - avoid pagecache and such because we cannot
include/scsi/fc/fc_fc2.h +1 -2
@@ -92,8 +92,7 @@ struct fc_esb {__u8 _esb_resvd[4 ];__u8 esb_service_params[112 ];/* TBD */ __u8 esb_seq_status[8 ];/* sequence statuses, 8 bytes each */ -} __attribute__((packed));; - +} __attribute__((packed));/* * Define expected size for ASSERTs.
kernel/trace/trace_hw_branches.c +1 -1
@@ -155,7 +155,7 @@ static enum print_line_t bts_trace_print_line(struct trace_iterator *iter) seq_print_ip_sym(seq, it->from, symflags) && trace_seq_printf(seq, "\n"))return TRACE_TYPE_HANDLED ; -return TRACE_TYPE_PARTIAL_LINE ;; +return TRACE_TYPE_PARTIAL_LINE ; }return TRACE_TYPE_UNHANDLED ; }
net/wireless/wext-compat.c +1 -1
@@ -794,7 +794,7 @@ int cfg80211_wext_siwtxpower(struct net_device *dev,return 0 ; } -return rdev->ops->set_tx_power (wdev->wiphy, type, dbm);; +return rdev->ops->set_tx_power (wdev->wiphy, type, dbm); }EXPORT_SYMBOL_GPL (cfg80211_wext_siwtxpower);
sound/oss/sys_timer.c +0 -3
@@ -100,9 +100,6 @@ def_tmr_open(int dev, int mode) curr_tempo =60 ; curr_timebase =100 ; opened =1 ; - - ; - { def_tmr.expires = (1 ) + jiffies;add_timer (&def_tmr);
sound/soc/codecs/wm9081.c +1 -1
@@ -1079,7 +1079,7 @@ static int wm9081_hw_params(struct snd_pcm_substream *substream, - wm9081->fs);for (i =1 ; i <ARRAY_SIZE (clk_sys_rates); i++) { cur_val =abs ((wm9081->sysclk_rate / - clk_sys_rates[i].ratio) - wm9081->fs);; + clk_sys_rates[i].ratio) - wm9081->fs);if (cur_val < best_val) { best = i; best_val = cur_val;
sound/soc/pxa/pxa-ssp.c +1 -1
@@ -351,7 +351,7 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai,do_div (tmp, freq_out); val = tmp; - val = (val <<16 ) |64 ;; + val = (val <<16 ) |64 ;ssp_write_reg (ssp,SSACDD , val); ssacd |= (0x6 <<4 );
sound/soc/s3c24xx/s3c24xx_uda134x.c +1 -1
@@ -67,7 +67,7 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream) {int ret =0 ;#ifdef ENFORCE_RATES -struct snd_pcm_runtime *runtime = substream->runtime;; +struct snd_pcm_runtime *runtime = substream->runtime;#endif mutex_lock (&clk_lock);
Jean Delvare
AppliedRe: [lm-sensors] [PATCH 18/62] drivers/hwmon/sht15.c: Remove unnecessary semicolons
In reply to Joe PerchesHi Joe,
Quoted 10 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>--- drivers/hwmon/sht15.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/hwmon/sht15.c +0
-0
drivers/hwmon/sht15.c static inline int sht15_update_single_val(struct sht15_data *data, · line 263
Quoted 8 lines
drivers/hwmon/sht15.c +1
-1@@ -257,7 +257,7 @@ static inline int sht15_update_single_val(struct sht15_data *data, (data->flag =SHT15_READING_NOTHING ), msecs_to_jiffies(timeout_msecs));if (ret =0 ) {/* timeout occurred */ -disable_irq_nosync (gpio_to_irq (data->pdata->gpio_data));; +disable_irq_nosync (gpio_to_irq (data->pdata->gpio_data));sht15_connection_reset (data);return -ETIME ; }
Applied, thanks.
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Hi Joe,
Quoted 2 lines · David Miller
Quoted 2 lines
I'm all for this, to be honest, and I'm very much for rolling this into one single patch too :)
Quoted 3 lines · Joe Perches
Here's just the single one, but doesn't a patch
that span multiple arches make it a bit more
troublesome for the arch maintainers?
I wouldn't think so. Removing double semicolons here and there is unlikely to cause a lot of merge conflicts.
Pekka
Quoted 2 lines · Pekka Enberg
I wouldn't think so. Removing double semicolons here and there is unlikely to cause a lot of merge conflicts.
Fine by me. I was surprised that 139 of them existed.
Quoted 4 lines · Joe Perches
Quoted 2 lines
I'm all for this, to be honest, and I'm very much for rolling this into one single patch too :)
Here's just the single one, but doesn't a patch that span multiple arches make it a bit more troublesome for the arch maintainers?
Apparently subsystem maintainers started to pick the relevant bits into their trees.
After checking which ones were merged and which ones were not, if you could create a single patch with the remaining bits, I'll happily take them through the trivial queue.
Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs
Re: [PATCH 50/62] drivers/video/imxfb.c: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 1 line · Joe Perches
Signed-off-by Joe Perches <[email protected]>
Quoted 21 lines
--- drivers/video/imxfb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/video/imxfb.c +1
-1@@ -677,7 +677,7 @@ static int __init imxfb_probe(struct platform_device *pdev) fbi->clk =clk_get (&pdev->dev,NULL );if (IS_ERR (fbi->clk)) { - ret =PTR_ERR (fbi->clk);; + ret =PTR_ERR (fbi->clk);dev_err (&pdev->dev,"unable to get clock: %d\n" , ret); goto failed_getclock; }Signature · 1 line
1.6.3.1.10.g659a0.dirty
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH 62/62] sound: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 1 line · Joe Perches
Signed-off-by Joe Perches <[email protected]>
Quoted 6 lines · Joe Perches
Found by script
#!/bin/bashfrom=";\s*;\s*\n"
to=";\n"
Quoted 9 lines
for file in $(grep -rP --include=*.[ch] -li $from *) ; do
perl -i -e \ "local $/; while(<>) { s/$from/$to/g; print; }" $filedone
Some false positives removed manually
Do we want this in checkpatch.pl?
I do.
Boaz
Liam Girdwood
AppliedRe: [PATCH 37/62] drivers/regulator/pcf50633-regulator.c: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 10 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>--- drivers/regulator/pcf50633-regulator.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/regulator/pcf50633-regulator.c +0
-0
drivers/regulator/pcf50633-regulator.c static int pcf50633_regulator_get_voltage(struct regulator_dev *rdev) · line 161
Quoted 8 lines
drivers/regulator/pcf50633-regulator.c +1
-1@@ -155,7 +155,7 @@ static int pcf50633_regulator_get_voltage(struct regulator_dev *rdev)int regulator_id, millivolts, volt_bits;u8 regnr; - pcf =rdev_get_drvdata (rdev);; + pcf =rdev_get_drvdata (rdev); regulator_id =rdev_get_id (rdev);if (regulator_id >=PCF50633_NUM_REGULATORS )
Applied.
Thanks
Liam
Re: [PATCH 05/62] arch/powerpc: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 10 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>--- arch/powerpc/mm/tlb_hash64.c | 2 +- arch/powerpc/oprofile/cell/vma_map.c | 2 +- arch/powerpc/platforms/powermac/cpufreq_64.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 2 +- arch/powerpc/platforms/ps3/system-bus.c | 1 - arch/powerpc/sysdev/fsl_rio.c | 2 +- arch/powerpc/sysdev/ppc4xx_pci.c | 4 ++-- 7 files changed, 7 insertions(+), 8 deletions(-)
For ps3/system-bus.c only.
Re: [PATCH 52/62] drivers/watchdog/bcm47xx_wdt.c: Remove unnecessary semicolons
In reply to Joe PerchesHi Joe,
Will add this to the linux-2.6-watchdog trees.
Thanks,
Wim.
Quoted 21 lines
Signed-off-by Joe Perches <[email protected]>--- drivers/watchdog/bcm47xx_wdt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/watchdog/bcm47xx_wdt.c +1
-1@@ -161,7 +161,7 @@ static long bcm47xx_wdt_ioctl(struct file *file, {void __user *argp = (void __user *)arg;int __user *p = argp; -int new_value, retval = -EINVAL ;; +int new_value, retval = -EINVAL ;switch (cmd) {case WDIOC_GETSUPPORT :Signature · 1 line
1.6.3.1.10.g659a0.dirty
Re: [PATCH 35/62] drivers/pci/pcie/aer/ecrc.c: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 10 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>--- drivers/pci/pcie/aer/ecrc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/pci/pcie/aer/ecrc.c +0
-0
drivers/pci/pcie/aer/ecrc.c void pcie_set_ecrc_checking(struct pci_dev *dev) · line 112
Quoted 8 lines
drivers/pci/pcie/aer/ecrc.c +1
-1@@ -106,7 +106,7 @@ void pcie_set_ecrc_checking(struct pci_dev *dev)disable_ecrc_checking (dev);break ;case ECRC_POLICY_ON : -enable_ecrc_checking (dev);; +enable_ecrc_checking (dev);break ;default :return ;
Signature · 2 lines
Andrew Patterson Hewlett-Packard
Jesse Barnes
AppliedRe: [PATCH 35/62] drivers/pci/pcie/aer/ecrc.c: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 1 line · On Sun, 28 Jun 2009 09:26:40 -0700 Joe Perches <[email protected]> wrote:
Signed-off-by Joe Perches <[email protected]>
Applied to my for-linus branch, thanks. It would be nicer if this was part of a series with real fixes though (hint, hint :).
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Quoted 10 lines · Jiri Kosina
Quoted 4 lines · Joe Perches
Quoted 2 lines
I'm all for this, to be honest, and I'm very much for rolling this into one single patch too :)
Here's just the single one, but doesn't a patch that span multiple arches make it a bit more troublesome for the arch maintainers?
Apparently subsystem maintainers started to pick the relevant bits into their trees.
After checking which ones were merged and which ones were not, if you could create a single patch with the remaining bits, I'll happily take them through the trivial queue.
I've no idea who picks up what.
Should this be rerolled against linux-next in a couple of weeks?
Quoted 5 lines · Joe Perches
Quoted 4 lines
Apparently subsystem maintainers started to pick the relevant bits into their trees. After checking which ones were merged and which ones were not, if you could create a single patch with the remaining bits, I'll happily take them through the trivial queue.
I've no idea who picks up what.
That's the downside of having sent this as indepdendent pieces, yes.
Quoted 1 line
Should this be rerolled against linux-next in a couple of weeks?
Yup, I think that is a good option.
Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs
Re: [PATCH 26/62] drivers/mmc/host/imxmmc.c: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 10 lines · On Sunday 28 June 2009 18:26:31 Joe Perches wrote:
Signed-off-by Joe Perches <[email protected]>--- drivers/mmc/host/imxmmc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/mmc/host/imxmmc.c +0
-0
drivers/mmc/host/imxmmc.c static irqreturn_t imxmci_irq(int irq, void *devid) · line 658
Quoted 8 lines
drivers/mmc/host/imxmmc.c +1
-1@@ -652,7 +652,7 @@ static irqreturn_t imxmci_irq(int irq, void *devid)set_bit (IMXMCI_PEND_STARTED_b, &host->pending_events);tasklet_schedule (&host->tasklet); -return IRQ_RETVAL (handled);; +return IRQ_RETVAL (handled); }static void imxmci_tasklet_fnc (unsigned long data)
==================================================
PiKRON s.r.o. Phone/Fax: +420 2 84684676 Kankovskeho 1235 Phone: +420 2 84684676 182 00 Praha 8 WWW: http://www.pikron.com/ Czech Republic e-mail: [email protected]
==================================================
Signature · 7 lines
Yours sincerely
Pavel Pisa
e-mail: [email protected]
www: http://cmp.felk.cvut.cz/~pisa
university: http://dce.felk.cvut.cz/
company: http://www.pikron.com/Re: [PATCH 15/62] drivers/dma/fsldma.c: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 4 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>---
drivers/dma/fsldma.c | 2 +-1 files changed, 1 insertions(+), 1 deletions(-)
Applied 15 and 16.
Thanks,
Dan
Greg Ungerer
AppliedRe: [PATCH 03/62] arch/m68knommu/kernel/time.c: Remove unnecessary semicolons
In reply to Joe PerchesHi Joe,
Quoted 1 line · Joe Perches
Signed-off-by Joe Perches <[email protected]>
Thanks, applied.
Regards
Greg
Quoted 17 lines
--- arch/m68knommu/kernel/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/m68knommu/kernel/time.c +1
-1@@ -69,7 +69,7 @@ static unsigned long read_rtc_mmss(void)if ((year +=1900 ) <1970 ) year +=100 ; -return mktime (year, mon, day, hour, min, sec);; +return mktime (year, mon, day, hour, min, sec); }unsigned long read_persistent_clock (void )
Signature · 5 lines
------------------------------------------------------------------------ Greg Ungerer -- Principal Engineer EMAIL: [email protected] SnapGear Group, McAfee PHONE: +61 7 3435 2888 825 Stanley St, FAX: +61 7 3891 3630 Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com
Theodore Tso
maintainerRe: [PATCH 57/62] fs/ext4/mballoc.c: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 1 line · Joe Perches
Signed-off-by Joe Perches <[email protected]>
Thanks, added to the ext4 patch queue.
- Ted
Jeff Garzik
AppliedRe: [PATCH 12/62] drivers/ata: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 5 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>--- drivers/ata/pata_octeon_cf.c | 2 +- drivers/ata/sata_inic162x.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
applied
Re: [PATCH 26/62] drivers/mmc/host/imxmmc.c: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 10 lines · On Sun, 28 Jun 2009 09:26:31 -0700 Joe Perches <[email protected]> wrote:
Signed-off-by Joe Perches <[email protected]>--- drivers/mmc/host/imxmmc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/mmc/host/imxmmc.c +0
-0
drivers/mmc/host/imxmmc.c static irqreturn_t imxmci_irq(int irq, void *devid) · line 658
Quoted 8 lines
drivers/mmc/host/imxmmc.c +1
-1@@ -652,7 +652,7 @@ static irqreturn_t imxmci_irq(int irq, void *devid)set_bit (IMXMCI_PEND_STARTED_b, &host->pending_events);tasklet_schedule (&host->tasklet); -return IRQ_RETVAL (handled);; +return IRQ_RETVAL (handled); }static void imxmci_tasklet_fnc (unsigned long data)
Queued.
Signature · 6 lines
-- Pierre Ossman WARNING: This correspondence is being monitored by the Swedish government. Make sure your server uses encryption for SMTP traffic and consider using PGP for end-to-end encryption.
Re: [PATCH 26/62] drivers/mmc/host/imxmmc.c: Remove unnecessary semicolons
Quoted 16 lines · On Friday 31 July 2009 11:30:26 Pierre Ossman wrote:
On Sun, 28 Jun 2009 09:26:31 -0700
Quoted 13 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>--- drivers/mmc/host/imxmmc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/mmc/host/imxmmc.c +0
-0@@ -652,7 +652,7 @@ static irqreturn_t imxmci_irq(int irq, void *devid)set_bit (IMXMCI_PEND_STARTED_b, &host->pending_events);tasklet_schedule (&host->tasklet);
Quoted 7 lines
drivers/mmc/host/imxmmc.c static irqreturn_t imxmci_irq(int irq, void *devid) · line 658
Quoted 5 lines
drivers/mmc/host/imxmmc.c +1
-1-return IRQ_RETVAL (handled);; +return IRQ_RETVAL (handled); }static void imxmci_tasklet_fnc (unsigned long data)Queued.
Hello Pierre,
I have already ACKed this patch on some other mailing list. But generally do not count with me much, because I have finish other demanding things at company and university before could return to great kernel playground.
I would like to send you BIG THANKS for all your MMC/SD related work as well.
Best wishes,
Pavel
--
Pavel Pisa
e-mail: [email protected]
www: http://cmp.felk.cvut.cz/~pisa
university: http://dce.felk.cvut.cz/
company: http://www.pikron.com/
Re: [Ocfs2-devel] [PATCH 59/62] fs/ocfs2/quota_global.c: Remove unnecessary semicolons
In reply to Joe PerchesQuoted 1 line · Joe Perches
Signed-off-by Joe Perches <[email protected]>
--
Mark Fasheh