2010-11-15 03:05:31

by Joe Perches

[permalink] [raw]
Subject: [PATCH 00/44] remove unnecessary semicolons

ya trivial series...

Joe Perches (44):
arch/arm: Remove unnecessary semicolons
arch/microblaze: Remove unnecessary semicolons
arch/um: Remove unnecessary semicolons
drivers/cpufreq: Remove unnecessary semicolons
drivers/gpio: Remove unnecessary semicolons
drivers/i2c: Remove unnecessary semicolons
drivers/isdn: Remove unnecessary semicolons
drivers/leds: Remove unnecessary semicolons
drivers/media/video: Remove unnecessary semicolons
drivers/misc: Remove unnecessary semicolons
drivers/mmc: Remove unnecessary semicolons
drivers/net/bnx2x: Remove unnecessary semicolons
drivers/net/e1000e: Remove unnecessary semicolons
drivers/net/ixgbe: Remove unnecessary semicolons
drivers/net/vxge: Remove unnecessary semicolons
drivers/net/wireless/ath: Remove unnecessary semicolons
drivers/net/wireless/iwlwifi: Remove unnecessary semicolons
drivers/net/cnic.c: Remove unnecessary semicolons
drivers/platform/x86: Remove unnecessary semicolons
drivers/power: Remove unnecessary semicolons
drivers/s390/net: Remove unnecessary semicolons
drivers/scsi/be2iscsi: Remove unnecessary semicolons
drivers/scsi/bfa: Remove unnecessary semicolons
drivers/scsi/lpfc: Remove unnecessary semicolons
drivers/scsi/pm8001: Remove unnecessary semicolons
drivers/scsi/qla2xxx: Remove unnecessary semicolons
drivers/serial: Remove unnecessary semicolons
drivers/spi: Remove unnecessary semicolons
drivers/staging: Remove unnecessary semicolons
drivers/usb/gadget: Remove unnecessary semicolons
drivers/xen: Remove unnecessary semicolons
fs/9p: Remove unnecessary semicolons
fs/ceph: Remove unnecessary semicolons
fs/logfs: Remove unnecessary semicolons
fs/nfs: Remove unnecessary semicolons
fs/ocfs2: Remove unnecessary semicolons
fs/ubifs: Remove unnecessary semicolons
include/linux/if_macvlan.h: Remove unnecessary semicolons
include/net/caif/cfctrl.h: Remove unnecessary semicolons
mm/hugetlb.c: Remove unnecessary semicolons
net/ipv6/mcast.c: Remove unnecessary semicolons
net/sunrpc/addr.c: Remove unnecessary semicolons
sound/core/pcm_lib.c: Remove unnecessary semicolons
sound/soc/codecs: Remove unnecessary semicolons

arch/arm/mach-at91/at91cap9_devices.c | 2 +-
arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
arch/arm/mach-nuc93x/time.c | 2 +-
arch/arm/mach-tegra/tegra2_clocks.c | 2 +-
arch/arm/mach-w90x900/cpu.c | 2 +-
arch/arm/plat-mxc/irq.c | 2 +-
arch/microblaze/lib/memmove.c | 2 +-
arch/um/drivers/mmapper_kern.c | 2 +-
drivers/cpufreq/cpufreq_conservative.c | 2 +-
drivers/gpio/langwell_gpio.c | 2 +-
drivers/i2c/busses/i2c-designware.c | 2 +-
drivers/isdn/hardware/mISDN/mISDNinfineon.c | 4 ++--
drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +-
drivers/leds/leds-mc13783.c | 2 +-
drivers/media/video/cx88/cx88-blackbird.c | 2 +-
drivers/media/video/davinci/vpfe_capture.c | 2 +-
drivers/media/video/em28xx/em28xx-cards.c | 2 +-
drivers/misc/bmp085.c | 2 +-
drivers/misc/isl29020.c | 2 +-
drivers/mmc/host/davinci_mmc.c | 2 +-
drivers/net/bnx2x/bnx2x_link.c | 4 ++--
drivers/net/bnx2x/bnx2x_main.c | 2 +-
drivers/net/cnic.c | 2 +-
drivers/net/e1000e/netdev.c | 2 +-
drivers/net/ixgbe/ixgbe_sriov.c | 2 +-
drivers/net/vxge/vxge-main.c | 2 +-
drivers/net/wireless/ath/ath9k/htc.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +-
drivers/platform/x86/classmate-laptop.c | 2 +-
drivers/platform/x86/thinkpad_acpi.c | 2 +-
drivers/power/intel_mid_battery.c | 2 +-
drivers/s390/net/qeth_core_sys.c | 2 +-
drivers/scsi/be2iscsi/be_main.c | 4 ++--
drivers/scsi/bfa/bfa_fcs_lport.c | 2 +-
drivers/scsi/lpfc/lpfc_bsg.c | 2 +-
drivers/scsi/pm8001/pm8001_init.c | 2 +-
drivers/scsi/qla2xxx/qla_isr.c | 4 ++--
drivers/scsi/qla2xxx/qla_nx.c | 2 +-
drivers/serial/mrst_max3110.c | 2 +-
drivers/spi/amba-pl022.c | 2 +-
drivers/spi/spi_nuc900.c | 2 +-
.../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 2 +-
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 +-
drivers/staging/bcm/InterfaceInit.c | 2 +-
drivers/staging/bcm/InterfaceIsr.c | 2 +-
drivers/staging/bcm/Misc.c | 4 ++--
.../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/cb_das16_cs.c | 2 +-
drivers/staging/comedi/drivers/comedi_bond.c | 2 +-
drivers/staging/crystalhd/crystalhd_hw.c | 2 +-
drivers/staging/go7007/go7007-driver.c | 2 +-
drivers/staging/iio/accel/lis3l02dq_ring.c | 2 +-
.../staging/intel_sst/intel_sst_drv_interface.c | 4 ++--
drivers/staging/keucr/smilmain.c | 4 ++--
drivers/staging/keucr/smilsub.c | 4 ++--
drivers/staging/msm/lcdc_toshiba_wvga_pt.c | 2 +-
drivers/staging/rt2860/common/cmm_data_pci.c | 4 ++--
drivers/staging/rt2860/rt_linux.c | 2 +-
drivers/staging/rt2860/rtmp.h | 2 +-
drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 2 +-
drivers/staging/rtl8192e/r819xE_phy.c | 2 +-
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +-
drivers/staging/rtl8192u/r8192U_core.c | 2 +-
drivers/staging/rtl8192u/r819xU_phy.c | 2 +-
drivers/staging/rtl8712/rtl8712_efuse.c | 2 +-
drivers/staging/rtl8712/rtl8712_xmit.c | 2 +-
drivers/staging/rtl8712/rtl871x_xmit.c | 2 +-
drivers/staging/tidspbridge/core/tiomap3430.c | 4 ++--
drivers/staging/tidspbridge/rmgr/nldr.c | 2 +-
drivers/staging/vt6655/card.c | 2 +-
drivers/staging/vt6655/iwctl.c | 2 +-
drivers/staging/vt6655/wpa2.c | 4 ++--
drivers/staging/vt6656/baseband.c | 2 +-
drivers/staging/vt6656/iwctl.c | 2 +-
drivers/staging/vt6656/power.c | 2 +-
drivers/staging/vt6656/wpa2.c | 4 ++--
drivers/usb/gadget/f_fs.c | 2 +-
drivers/xen/swiotlb-xen.c | 2 +-
fs/9p/acl.c | 2 +-
fs/9p/xattr.c | 2 +-
fs/ceph/mds_client.c | 2 +-
fs/logfs/readwrite.c | 2 +-
fs/nfs/getroot.c | 2 +-
fs/ocfs2/refcounttree.c | 2 +-
fs/ubifs/scan.c | 2 +-
include/linux/if_macvlan.h | 2 +-
include/net/caif/cfctrl.h | 2 +-
mm/hugetlb.c | 2 +-
net/ipv6/mcast.c | 2 +-
net/sunrpc/addr.c | 2 +-
sound/core/pcm_lib.c | 2 +-
sound/soc/codecs/wm8904.c | 2 +-
sound/soc/codecs/wm8940.c | 1 -
sound/soc/codecs/wm8993.c | 2 +-
sound/soc/codecs/wm_hubs.c | 2 +-
100 files changed, 111 insertions(+), 112 deletions(-)

--
1.7.3.1.g432b3.dirty


2010-11-15 03:05:40

by Joe Perches

[permalink] [raw]
Subject: [PATCH 15/44] drivers/net/vxge: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/vxge/vxge-main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 813829f..93e80c5 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -2062,7 +2062,7 @@ static irqreturn_t vxge_isr_napi(int irq, void *dev_id)
struct __vxge_hw_device *hldev;
u64 reason;
enum vxge_hw_status status;
- struct vxgedev *vdev = (struct vxgedev *) dev_id;;
+ struct vxgedev *vdev = (struct vxgedev *)dev_id;

vxge_debug_intr(VXGE_TRACE, "%s:%d", __func__, __LINE__);

--
1.7.3.1.g432b3.dirty

2010-11-15 03:05:45

by Joe Perches

[permalink] [raw]
Subject: [PATCH 25/44] drivers/scsi/pm8001: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/scsi/pm8001/pm8001_init.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index f8c86b2..be210dd 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -160,7 +160,7 @@ static void pm8001_free(struct pm8001_hba_info *pm8001_ha)
static void pm8001_tasklet(unsigned long opaque)
{
struct pm8001_hba_info *pm8001_ha;
- pm8001_ha = (struct pm8001_hba_info *)opaque;;
+ pm8001_ha = (struct pm8001_hba_info *)opaque;
if (unlikely(!pm8001_ha))
BUG_ON(1);
PM8001_CHIP_DISP->isr(pm8001_ha);
--
1.7.3.1.g432b3.dirty

2010-11-15 03:06:05

by Joe Perches

[permalink] [raw]
Subject: [PATCH 43/44] sound/core/pcm_lib.c: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
sound/core/pcm_lib.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index a1707cc..b75db8e 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -223,7 +223,7 @@ static void xrun_log(struct snd_pcm_substream *substream,
entry->jiffies = jiffies;
entry->pos = pos;
entry->period_size = runtime->period_size;
- entry->buffer_size = runtime->buffer_size;;
+ entry->buffer_size = runtime->buffer_size;
entry->old_hw_ptr = runtime->status->hw_ptr;
entry->hw_ptr_base = runtime->hw_ptr_base;
log->idx = (log->idx + 1) % XRUN_LOG_CNT;
--
1.7.3.1.g432b3.dirty

2010-11-15 03:05:36

by Joe Perches

[permalink] [raw]
Subject: [PATCH 11/44] drivers/mmc: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/mmc/host/davinci_mmc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index e15547c..b643dde 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -480,7 +480,7 @@ static void mmc_davinci_send_dma_request(struct mmc_davinci_host *host,
struct scatterlist *sg;
unsigned sg_len;
unsigned bytes_left = host->bytes_left;
- const unsigned shift = ffs(rw_threshold) - 1;;
+ const unsigned shift = ffs(rw_threshold) - 1;

if (host->data_dir == DAVINCI_MMC_DATADIR_WRITE) {
template = &host->tx_template;
--
1.7.3.1.g432b3.dirty

2010-11-15 03:05:47

by Joe Perches

[permalink] [raw]
Subject: [PATCH 28/44] drivers/spi: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/spi/amba-pl022.c | 2 +-
drivers/spi/spi_nuc900.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
index fb3d1b3..2e50631 100644
--- a/drivers/spi/amba-pl022.c
+++ b/drivers/spi/amba-pl022.c
@@ -956,7 +956,7 @@ static int configure_dma(struct pl022 *pl022)
tx_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
break;
case WRITING_U32:
- tx_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;;
+ tx_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
break;
}

diff --git a/drivers/spi/spi_nuc900.c b/drivers/spi/spi_nuc900.c
index dff63be..d5be18b 100644
--- a/drivers/spi/spi_nuc900.c
+++ b/drivers/spi/spi_nuc900.c
@@ -449,7 +449,7 @@ err_iomap:
release_mem_region(hw->res->start, resource_size(hw->res));
kfree(hw->ioarea);
err_pdata:
- spi_master_put(hw->master);;
+ spi_master_put(hw->master);

err_nomem:
return err;
--
1.7.3.1.g432b3.dirty

2010-11-15 03:06:17

by Joe Perches

[permalink] [raw]
Subject: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
sound/soc/codecs/wm8904.c | 2 +-
sound/soc/codecs/wm8940.c | 1 -
sound/soc/codecs/wm8993.c | 2 +-
sound/soc/codecs/wm_hubs.c | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 33be84e..99ae66d 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -1590,7 +1590,7 @@ static int wm8904_hw_params(struct snd_pcm_substream *substream,
- wm8904->fs);
for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) {
cur_val = abs((wm8904->sysclk_rate /
- clk_sys_rates[i].ratio) - wm8904->fs);;
+ clk_sys_rates[i].ratio) - wm8904->fs);
if (cur_val < best_val) {
best = i;
best_val = cur_val;
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index 2cb16f8..e3f3572 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -735,7 +735,6 @@ static int wm8940_probe(struct snd_soc_codec *codec)
return ret;

return ret;
-;
}

static int wm8940_remove(struct snd_soc_codec *codec)
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 589e3fa..74af9c5 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -1225,7 +1225,7 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream,
- wm8993->fs);
for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) {
cur_val = abs((wm8993->sysclk_rate /
- clk_sys_rates[i].ratio) - wm8993->fs);;
+ clk_sys_rates[i].ratio) - wm8993->fs);
if (cur_val < best_val) {
best = i;
best_val = cur_val;
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 19ca782..2afbc7a 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -112,7 +112,7 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec)
switch (hubs->dcs_readback_mode) {
case 0:
reg_l = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_1)
- & WM8993_DCS_INTEG_CHAN_0_MASK;;
+ & WM8993_DCS_INTEG_CHAN_0_MASK;
reg_r = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_2)
& WM8993_DCS_INTEG_CHAN_1_MASK;
break;
--
1.7.3.1.g432b3.dirty

2010-11-15 03:06:01

by Joe Perches

[permalink] [raw]
Subject: [PATCH 29/44] drivers/staging: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
.../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 2 +-
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 +-
drivers/staging/bcm/InterfaceInit.c | 2 +-
drivers/staging/bcm/InterfaceIsr.c | 2 +-
drivers/staging/bcm/Misc.c | 4 ++--
.../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/cb_das16_cs.c | 2 +-
drivers/staging/comedi/drivers/comedi_bond.c | 2 +-
drivers/staging/crystalhd/crystalhd_hw.c | 2 +-
drivers/staging/go7007/go7007-driver.c | 2 +-
drivers/staging/iio/accel/lis3l02dq_ring.c | 2 +-
.../staging/intel_sst/intel_sst_drv_interface.c | 4 ++--
drivers/staging/keucr/smilmain.c | 4 ++--
drivers/staging/keucr/smilsub.c | 4 ++--
drivers/staging/msm/lcdc_toshiba_wvga_pt.c | 2 +-
drivers/staging/rt2860/common/cmm_data_pci.c | 4 ++--
drivers/staging/rt2860/rt_linux.c | 2 +-
drivers/staging/rt2860/rtmp.h | 2 +-
drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 2 +-
drivers/staging/rtl8192e/r819xE_phy.c | 2 +-
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +-
drivers/staging/rtl8192u/r8192U_core.c | 2 +-
drivers/staging/rtl8192u/r819xU_phy.c | 2 +-
drivers/staging/rtl8712/rtl8712_efuse.c | 2 +-
drivers/staging/rtl8712/rtl8712_xmit.c | 2 +-
drivers/staging/rtl8712/rtl871x_xmit.c | 2 +-
drivers/staging/tidspbridge/core/tiomap3430.c | 4 ++--
drivers/staging/tidspbridge/rmgr/nldr.c | 2 +-
drivers/staging/vt6655/card.c | 2 +-
drivers/staging/vt6655/iwctl.c | 2 +-
drivers/staging/vt6655/wpa2.c | 4 ++--
drivers/staging/vt6656/baseband.c | 2 +-
drivers/staging/vt6656/iwctl.c | 2 +-
drivers/staging/vt6656/power.c | 2 +-
drivers/staging/vt6656/wpa2.c | 4 ++--
39 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
index c307a55..3963038 100644
--- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
+++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
@@ -876,7 +876,7 @@ HIFAckInterrupt(HIF_DEVICE *device)
void
HIFUnMaskInterrupt(HIF_DEVICE *device)
{
- int ret;;
+ int ret;

AR_DEBUG_ASSERT(device != NULL);
AR_DEBUG_ASSERT(device->func != NULL);
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index a659f70..126a36a 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -4439,7 +4439,7 @@ skip_key:
for (i = assoc_req_ie_pos; i < assoc_req_ie_pos + assocReqLen - 4; i++) {
AR_DEBUG_PRINTF(ATH_DEBUG_WLAN_CONNECT,("%2.2x ", assocInfo[i]));
sprintf(pos, "%2.2x", assocInfo[i]);
- pos += 2;;
+ pos += 2;
}
AR_DEBUG_PRINTF(ATH_DEBUG_WLAN_CONNECT,("\n"));

diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index 824f9a4..a368011 100644
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -265,7 +265,7 @@ usbbcm_device_probe(struct usb_interface *intf, const struct usb_device_id *id)
uint32_t uiNackZeroLengthInt=4;
if(wrmalt(psAdapter, DISABLE_USB_ZERO_LEN_INT, &uiNackZeroLengthInt, sizeof(uiNackZeroLengthInt)))
{
- return -EIO;;
+ return -EIO;
}
}

diff --git a/drivers/staging/bcm/InterfaceIsr.c b/drivers/staging/bcm/InterfaceIsr.c
index f928fe4..604d07f 100644
--- a/drivers/staging/bcm/InterfaceIsr.c
+++ b/drivers/staging/bcm/InterfaceIsr.c
@@ -87,7 +87,7 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Interrupt IN endPoint has got halted/stalled...need to clear this");
Adapter->bEndPointHalted = TRUE ;
wake_up(&Adapter->tx_packet_wait_queue);
- urb->status = STATUS_SUCCESS ;;
+ urb->status = STATUS_SUCCESS ;
return;
}
/* software-driven interface shutdown */
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 22550f7..cd14fec 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -764,7 +764,7 @@ void SendIdleModeResponse(PMINI_ADAPTER Adapter)

/* Wake the LED Thread with IDLEMODE_ENTER State */
Adapter->DriverState = LOWPOWER_MODE_ENTER;
- BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL,"LED Thread is Running..Hence Setting LED Event as IDLEMODE_ENTER jiffies:%ld",jiffies);;
+ BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL,"LED Thread is Running..Hence Setting LED Event as IDLEMODE_ENTER jiffies:%ld",jiffies);
wake_up(&Adapter->LEDInfo.notify_led_event);

/* Wait for 1 SEC for LED to OFF */
@@ -1410,7 +1410,7 @@ int bcm_parse_target_params(PMINI_ADAPTER Adapter)

void beceem_parse_target_struct(PMINI_ADAPTER Adapter)
{
- UINT uiHostDrvrCfg6 =0, uiEEPROMFlag = 0;;
+ UINT uiHostDrvrCfg6 =0, uiEEPROMFlag = 0;

if(ntohl(Adapter->pstargetparams->m_u32PhyParameter2) & AUTO_SYNC_DISABLE)
{
diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
index 7361d50..0e6affd 100644
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.c
@@ -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 */
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
index 2a8a6c7..62f421a 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
@@ -2850,7 +2850,7 @@ static 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;
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
index 12fcc35..8a584a0 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.c
@@ -335,7 +335,7 @@ int i_APCI1516_WriteDigitalOutput(struct comedi_device *dev, struct comedi_subde
return -EINVAL;
} /* if else data[3]==1) */
} /* if else data[3]==0) */
- return (insn->n);;
+ return (insn->n);
}

/*
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
index 356a189..acaceb0 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
@@ -339,7 +339,7 @@ int i_APCI3501_ConfigAnalogOutput(struct comedi_device *dev, struct comedi_subde
int 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);

diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index 5d06457..7edeb11 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -971,7 +971,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;
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index 0345b4c..bb93685 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -169,7 +169,7 @@ static int das16cs_attach(struct comedi_device *dev,
if (!link)
return -EIO;

- dev->iobase = link->resource[0]->start;;
+ dev->iobase = link->resource[0]->start;
printk("I/O base=0x%04lx ", dev->iobase);

printk("fingerprint:\n");
diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c
index cfcbd9b..d8aefb2 100644
--- a/drivers/staging/comedi/drivers/comedi_bond.c
+++ b/drivers/staging/comedi/drivers/comedi_bond.c
@@ -370,7 +370,7 @@ static int doDevConfig(struct comedi_device *dev, struct comedi_devconfig *it)
struct comedi_device *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) {
diff --git a/drivers/staging/crystalhd/crystalhd_hw.c b/drivers/staging/crystalhd/crystalhd_hw.c
index f631857..153ddbf 100644
--- a/drivers/staging/crystalhd/crystalhd_hw.c
+++ b/drivers/staging/crystalhd/crystalhd_hw.c
@@ -1711,7 +1711,7 @@ enum BC_STATUS crystalhd_download_fw(struct crystalhd_adp *adp, void *buffer, ui
}

BCMLOG(BCMLOG_INFO, "Firmware Downloaded Successfully\n");
- return BC_STS_SUCCESS;;
+ return BC_STS_SUCCESS;
}

enum BC_STATUS crystalhd_do_fw_cmd(struct crystalhd_hw *hw,
diff --git a/drivers/staging/go7007/go7007-driver.c b/drivers/staging/go7007/go7007-driver.c
index b3f42f3..8426a02 100644
--- a/drivers/staging/go7007/go7007-driver.c
+++ b/drivers/staging/go7007/go7007-driver.c
@@ -624,7 +624,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;
diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index 330d5d6..1fd088a 100644
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -517,7 +517,7 @@ int lis3l02dq_configure_ring(struct iio_dev *indio_dev)

ret = iio_alloc_pollfunc(indio_dev, NULL, &lis3l02dq_poll_func_th);
if (ret)
- goto error_iio_sw_rb_free;;
+ goto error_iio_sw_rb_free;
indio_dev->modes |= INDIO_RING_TRIGGERED;
return 0;

diff --git a/drivers/staging/intel_sst/intel_sst_drv_interface.c b/drivers/staging/intel_sst/intel_sst_drv_interface.c
index 669e298..6443fbd 100644
--- a/drivers/staging/intel_sst/intel_sst_drv_interface.c
+++ b/drivers/staging/intel_sst/intel_sst_drv_interface.c
@@ -171,9 +171,9 @@ static int sst_get_sfreq(struct snd_sst_params *str_param)
case SST_CODEC_TYPE_MP3:
return str_param->sparams.uc.mp3_params.sfreq;
case SST_CODEC_TYPE_AAC:
- return str_param->sparams.uc.aac_params.sfreq;;
+ return str_param->sparams.uc.aac_params.sfreq;
case SST_CODEC_TYPE_WMA9:
- return str_param->sparams.uc.wma_params.sfreq;;
+ return str_param->sparams.uc.wma_params.sfreq;
default:
return 0;
}
diff --git a/drivers/staging/keucr/smilmain.c b/drivers/staging/keucr/smilmain.c
index bdfbf76..2cbe9f8 100644
--- a/drivers/staging/keucr/smilmain.c
+++ b/drivers/staging/keucr/smilmain.c
@@ -153,9 +153,9 @@ int Media_D_ReadSector(struct us_data *us, DWORD start,WORD count,BYTE *buf)
WORD len, bn;

//if (Check_D_MediaPower()) ; ?b 6250 don't care
- // return(ErrCode); ;
+ // return(ErrCode);
//if (Check_D_MediaFmt(fdoExt)) ;
- // return(ErrCode); ;
+ // return(ErrCode);
if (Conv_D_MediaAddr(us, start))
return(ErrCode);

diff --git a/drivers/staging/keucr/smilsub.c b/drivers/staging/keucr/smilsub.c
index 1b52535..ce10cf2 100644
--- a/drivers/staging/keucr/smilsub.c
+++ b/drivers/staging/keucr/smilsub.c
@@ -763,8 +763,8 @@ int Ssfdc_D_WriteSectForCopy(struct us_data *us, BYTE *buf, BYTE *redundant)
bcb->CDB[7] = (BYTE)addr;
bcb->CDB[6] = (BYTE)(addr/0x0100);
bcb->CDB[5] = Media.Zone/2;
- bcb->CDB[8] = *(redundant+REDT_ADDR1H);;
- bcb->CDB[9] = *(redundant+REDT_ADDR1L);;
+ bcb->CDB[8] = *(redundant+REDT_ADDR1H);
+ bcb->CDB[9] = *(redundant+REDT_ADDR1L);

result = ENE_SendScsiCmd(us, FDIR_WRITE, buf, 0);
if (result != USB_STOR_XFER_GOOD)
diff --git a/drivers/staging/msm/lcdc_toshiba_wvga_pt.c b/drivers/staging/msm/lcdc_toshiba_wvga_pt.c
index 864d7c1..edba78a 100644
--- a/drivers/staging/msm/lcdc_toshiba_wvga_pt.c
+++ b/drivers/staging/msm/lcdc_toshiba_wvga_pt.c
@@ -77,7 +77,7 @@ static void toshiba_spi_write(char cmd, uint32 data, int num)

/* followed by parameter bytes */
if (num) {
- bp = (char *)&data;;
+ bp = (char *)&data;
bp += (num - 1);
while (num) {
toshiba_spi_write_byte(1, *bp);
diff --git a/drivers/staging/rt2860/common/cmm_data_pci.c b/drivers/staging/rt2860/common/cmm_data_pci.c
index 43d73a0..7af59ff 100644
--- a/drivers/staging/rt2860/common/cmm_data_pci.c
+++ b/drivers/staging/rt2860/common/cmm_data_pci.c
@@ -137,7 +137,7 @@ u16 RtmpPCI_WriteSingleTxResource(struct rt_rtmp_adapter *pAd,

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;
@@ -215,7 +215,7 @@ u16 RtmpPCI_WriteMultiTxResource(struct rt_rtmp_adapter *pAd,

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;
diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
index abfeea1..7dad6ee 100644
--- a/drivers/staging/rt2860/rt_linux.c
+++ b/drivers/staging/rt2860/rt_linux.c
@@ -854,7 +854,7 @@ void send_monitor_packets(struct rt_rtmp_adapter *pAd, struct rt_rx_blk *pRxBlk)
RSSI1,
RSSI_1),
ConvertToRssi(pAd, pRxBlk->pRxWI->RSSI2,
- RSSI_2));;
+ RSSI_2));

ph->signal.did = DIDmsg_lnxind_wlansniffrm_signal;
ph->signal.status = 0;
diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
index ca54e53..26cc823 100644
--- a/drivers/staging/rt2860/rtmp.h
+++ b/drivers/staging/rt2860/rtmp.h
@@ -2978,7 +2978,7 @@ void LinkDown(struct rt_rtmp_adapter *pAd, IN BOOLEAN IsReqFromAP);

void IterateOnBssTab(struct rt_rtmp_adapter *pAd);

-void IterateOnBssTab2(struct rt_rtmp_adapter *pAd);;
+void IterateOnBssTab2(struct rt_rtmp_adapter *pAd);

void JoinParmFill(struct rt_rtmp_adapter *pAd,
struct rt_mlme_join_req *JoinReq, unsigned long BssIdx);
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
index dd8a221..b26b5a8 100644
--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
+++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c
@@ -822,7 +822,7 @@ int ieee80211_rtl_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;
}


diff --git a/drivers/staging/rtl8192e/r819xE_phy.c b/drivers/staging/rtl8192e/r819xE_phy.c
index d83bcbc..50cd0e5 100644
--- a/drivers/staging/rtl8192e/r819xE_phy.c
+++ b/drivers/staging/rtl8192e/r819xE_phy.c
@@ -2596,7 +2596,7 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device* dev, RF90_RADIO_PATH_E
break;
}

- return ret;;
+ return ret;

}
/******************************************************************************
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
index 81aa2ed..ec7845e 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
@@ -754,7 +754,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;
}


diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index 494f180..1139a27 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -5085,7 +5085,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;

diff --git a/drivers/staging/rtl8192u/r819xU_phy.c b/drivers/staging/rtl8192u/r819xU_phy.c
index a3adaed..8e10992 100644
--- a/drivers/staging/rtl8192u/r819xU_phy.c
+++ b/drivers/staging/rtl8192u/r819xU_phy.c
@@ -1011,7 +1011,7 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device* dev, RF90_RADIO_PATH_E
break;
}

- return ret;;
+ return ret;

}
/******************************************************************************
diff --git a/drivers/staging/rtl8712/rtl8712_efuse.c b/drivers/staging/rtl8712/rtl8712_efuse.c
index 9730ae1..1dc12b7 100644
--- a/drivers/staging/rtl8712/rtl8712_efuse.c
+++ b/drivers/staging/rtl8712/rtl8712_efuse.c
@@ -428,7 +428,7 @@ u8 r8712_efuse_access(struct _adapter *padapter, u8 bRead, u16 start_addr,
u16 cnts, u8 *data)
{
int i;
- u8 res = true;;
+ u8 res = true;

if (start_addr > EFUSE_MAX_SIZE)
return false;
diff --git a/drivers/staging/rtl8712/rtl8712_xmit.c b/drivers/staging/rtl8712/rtl8712_xmit.c
index 8edc518..88a1504 100644
--- a/drivers/staging/rtl8712/rtl8712_xmit.c
+++ b/drivers/staging/rtl8712/rtl8712_xmit.c
@@ -148,7 +148,7 @@ static u32 get_ff_hwaddr(struct xmit_frame *pxmitframe)
case 0x11:
case 0x12:
case 0x13:
- addr = RTL8712_DMA_H2CCMD;;
+ addr = RTL8712_DMA_H2CCMD;
break;
default:
addr = RTL8712_DMA_BEQ;/*RTL8712_EP_LO;*/
diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c
index b8195e3..75f1a6b 100644
--- a/drivers/staging/rtl8712/rtl871x_xmit.c
+++ b/drivers/staging/rtl8712/rtl871x_xmit.c
@@ -372,7 +372,7 @@ static sint xmitframe_addmic(struct _adapter *padapter,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x0, 0x0};
datalen = pattrib->pktlen - pattrib->hdrlen;
- pframe = pxmitframe->buf_addr + TXDESC_OFFSET;;
+ pframe = pxmitframe->buf_addr + TXDESC_OFFSET;
if (bmcst) {
if (!memcmp(psecuritypriv->XGrptxmickey
[psecuritypriv->XGrpKeyid].skey,
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index 1be081f..a3b0a18 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -596,7 +596,7 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt,
dev_dbg(bridge, "DSP c_int00 Address = 0x%x\n", dsp_addr);
if (dsp_debug)
while (__raw_readw(dw_sync_addr))
- ;;
+ ;

/* Wait for DSP to clear word in shared memory */
/* Read the Location */
@@ -1671,7 +1671,7 @@ static int pte_set(struct pg_table_attrs *pt, u32 pa, u32 va,
/* Find a free L2 PT. */
for (i = 0; (i < pt->l2_num_pages) &&
(pt->pg_info[i].num_entries != 0); i++)
- ;;
+ ;
if (i < pt->l2_num_pages) {
l2_page_num = i;
l2_base_pa = pt->l2_base_pa + (l2_page_num *
diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c
index a6ae007..28354bb 100644
--- a/drivers/staging/tidspbridge/rmgr/nldr.c
+++ b/drivers/staging/tidspbridge/rmgr/nldr.c
@@ -943,7 +943,7 @@ static int add_ovly_info(void *handle, struct dbll_sect_info *sect_info,

/* Determine which phase this section belongs to */
for (pch = sect_name + 1; *pch && *pch != seps; pch++)
- ;;
+ ;

if (*pch) {
pch++; /* Skip over the ':' */
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 32d095c..951a3a8 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -2058,7 +2058,7 @@ bool CARDbSoftwareReset (void *pDeviceHandler)
QWORD CARDqGetTSFOffset (unsigned char byRxRate, QWORD qwTSF1, QWORD qwTSF2)
{
QWORD qwTSFOffset;
- unsigned short wRxBcnTSFOffst= 0;;
+ unsigned short wRxBcnTSFOffst= 0;

HIDWORD(qwTSFOffset) = 0;
LODWORD(qwTSFOffset) = 0;
diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c
index 92e3399..5e425d1 100644
--- a/drivers/staging/vt6655/iwctl.c
+++ b/drivers/staging/vt6655/iwctl.c
@@ -2073,7 +2073,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,
diff --git a/drivers/staging/vt6655/wpa2.c b/drivers/staging/vt6655/wpa2.c
index 805164b..744799c 100644
--- a/drivers/staging/vt6655/wpa2.c
+++ b/drivers/staging/vt6655/wpa2.c
@@ -216,7 +216,7 @@ WPA2vParseRSN (
m = *((unsigned short *) &(pRSN->abyRSN[4]));

if (pRSN->len >= 10+m*4) { // ver(2) + GK(4) + PK count(2) + PKS(4*m) + AKMSS count(2)
- pBSSNode->wAKMSSAuthCount = *((unsigned short *) &(pRSN->abyRSN[6+4*m]));;
+ pBSSNode->wAKMSSAuthCount = *((unsigned short *) &(pRSN->abyRSN[6+4*m]));
j = 0;
pbyOUI = &(pRSN->abyRSN[8+4*m]);
for (i = 0; (i < pBSSNode->wAKMSSAuthCount) && (j < sizeof(pBSSNode->abyAKMSSAuthType)/sizeof(unsigned char)); i++) {
@@ -235,7 +235,7 @@ WPA2vParseRSN (
pBSSNode->wAKMSSAuthCount = (unsigned short)j;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAKMSSAuthCount: %d\n", pBSSNode->wAKMSSAuthCount);

- n = *((unsigned short *) &(pRSN->abyRSN[6+4*m]));;
+ n = *((unsigned short *) &(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 = *((unsigned short *) &(pRSN->abyRSN[8+4*m+4*n]));
diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index e5add20..0d11147 100644
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -963,7 +963,7 @@ BBvSetAntennaMode (PSDevice pDevice, BYTE byAntennaMode)
break;
case ANT_RXB:
pDevice->byBBRxConf &= 0xFE;
- pDevice->byBBRxConf |= 0x02;;
+ pDevice->byBBRxConf |= 0x02;
break;
}

diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 0004be8..2121205 100644
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -1883,7 +1883,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,
diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c
index 0c12fd3..e8c1b35 100644
--- a/drivers/staging/vt6656/power.c
+++ b/drivers/staging/vt6656/power.c
@@ -192,7 +192,7 @@ BOOL PSbConsiderPowerDown(void *hDeviceContext,
// check if already in Doze mode
ControlvReadByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PSCTL, &byData);
if ( (byData & PSCTL_PS) != 0 )
- return TRUE;;
+ return TRUE;

if (pMgmt->eCurrMode != WMAC_MODE_IBSS_STA) {
// check if in TIM wake period
diff --git a/drivers/staging/vt6656/wpa2.c b/drivers/staging/vt6656/wpa2.c
index 6d13190..d4f3f75 100644
--- a/drivers/staging/vt6656/wpa2.c
+++ b/drivers/staging/vt6656/wpa2.c
@@ -215,7 +215,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++) {
@@ -234,7 +234,7 @@ WPA2vParseRSN (
pBSSNode->wAKMSSAuthCount = (WORD)j;
DBG_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]));
--
1.7.3.1.g432b3.dirty

2010-11-15 03:06:34

by Joe Perches

[permalink] [raw]
Subject: [PATCH 42/44] net/sunrpc/addr.c: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
net/sunrpc/addr.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c
index 1419d0c..4195233 100644
--- a/net/sunrpc/addr.c
+++ b/net/sunrpc/addr.c
@@ -151,7 +151,7 @@ static size_t rpc_pton4(const char *buf, const size_t buflen,
return 0;

sin->sin_family = AF_INET;
- return sizeof(struct sockaddr_in);;
+ return sizeof(struct sockaddr_in);
}

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
--
1.7.3.1.g432b3.dirty

2010-11-15 03:07:09

by Joe Perches

[permalink] [raw]
Subject: [PATCH 40/44] mm/hugetlb.c: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
mm/hugetlb.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index c4a3558..8875242 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -540,7 +540,7 @@ static struct page *dequeue_huge_page_vma(struct hstate *h,

/* If reserves cannot be used, ensure enough pages are in the pool */
if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0)
- goto err;;
+ goto err;

for_each_zone_zonelist_nodemask(zone, z, zonelist,
MAX_NR_ZONES - 1, nodemask) {
--
1.7.3.1.g432b3.dirty

2010-11-15 03:07:34

by Joe Perches

[permalink] [raw]
Subject: [PATCH 39/44] include/net/caif/cfctrl.h: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
include/net/caif/cfctrl.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
index 9402543..e54f639 100644
--- a/include/net/caif/cfctrl.h
+++ b/include/net/caif/cfctrl.h
@@ -51,7 +51,7 @@ struct cfctrl_rsp {
void (*restart_rsp)(void);
void (*radioset_rsp)(void);
void (*reject_rsp)(struct cflayer *layer, u8 linkid,
- struct cflayer *client_layer);;
+ struct cflayer *client_layer);
};

/* Link Setup Parameters for CAIF-Links. */
--
1.7.3.1.g432b3.dirty

2010-11-15 03:06:03

by Joe Perches

[permalink] [raw]
Subject: [PATCH 32/44] fs/9p: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
fs/9p/acl.c | 2 +-
fs/9p/xattr.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/9p/acl.c b/fs/9p/acl.c
index 12d6023..bc4da9a 100644
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
@@ -28,7 +28,7 @@ static struct posix_acl *__v9fs_get_acl(struct p9_fid *fid, char *name)
{
ssize_t size;
void *value = NULL;
- struct posix_acl *acl = NULL;;
+ struct posix_acl *acl = NULL;

size = v9fs_fid_xattr_get(fid, name, NULL, 0);
if (size > 0) {
diff --git a/fs/9p/xattr.c b/fs/9p/xattr.c
index 43ec7df..d288773 100644
--- a/fs/9p/xattr.c
+++ b/fs/9p/xattr.c
@@ -133,7 +133,7 @@ int v9fs_xattr_set(struct dentry *dentry, const char *name,
"p9_client_xattrcreate failed %d\n", retval);
goto error;
}
- msize = fid->clnt->msize;;
+ msize = fid->clnt->msize;
while (value_len) {
if (value_len > (msize - P9_IOHDRSZ))
write_count = msize - P9_IOHDRSZ;
--
1.7.3.1.g432b3.dirty

2010-11-15 03:05:59

by Joe Perches

[permalink] [raw]
Subject: [PATCH 30/44] drivers/usb/gadget: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/usb/gadget/f_fs.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index 4a830df..38bb200 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -2096,7 +2096,7 @@ static int __ffs_func_bind_do_descs(enum ffs_entity_type type, u8 *valuep,
ep = usb_ep_autoconfig(func->gadget, ds);
if (unlikely(!ep))
return -ENOTSUPP;
- ep->driver_data = func->eps + idx;;
+ ep->driver_data = func->eps + idx;

req = usb_ep_alloc_request(ep, GFP_KERNEL);
if (unlikely(!req))
--
1.7.3.1.g432b3.dirty

2010-11-15 03:07:57

by Joe Perches

[permalink] [raw]
Subject: [PATCH 37/44] fs/ubifs: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
fs/ubifs/scan.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c
index 3e1ee57..36216b4 100644
--- a/fs/ubifs/scan.c
+++ b/fs/ubifs/scan.c
@@ -328,7 +328,7 @@ struct ubifs_scan_leb *ubifs_scan(const struct ubifs_info *c, int lnum,
if (!quiet)
ubifs_err("empty space starts at non-aligned offset %d",
offs);
- goto corrupted;;
+ goto corrupted;
}

ubifs_end_scan(c, sleb, lnum, offs);
--
1.7.3.1.g432b3.dirty

2010-11-15 03:08:27

by Joe Perches

[permalink] [raw]
Subject: [PATCH 36/44] fs/ocfs2: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
fs/ocfs2/refcounttree.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index b5f9160..da14a42 100644
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -3704,7 +3704,7 @@ int ocfs2_refcount_cow_xattr(struct inode *inode,
context->cow_start = cow_start;
context->cow_len = cow_len;
context->ref_tree = ref_tree;
- context->ref_root_bh = ref_root_bh;;
+ context->ref_root_bh = ref_root_bh;
context->cow_object = xv;

context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_jbd;
--
1.7.3.1.g432b3.dirty

2010-11-15 03:08:41

by Joe Perches

[permalink] [raw]
Subject: [PATCH 35/44] fs/nfs: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
fs/nfs/getroot.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c
index ac7b814..e17f628 100644
--- a/fs/nfs/getroot.c
+++ b/fs/nfs/getroot.c
@@ -190,7 +190,7 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh)

fattr = nfs_alloc_fattr();
if (fattr == NULL)
- return ERR_PTR(-ENOMEM);;
+ return ERR_PTR(-ENOMEM);

/* get the actual root for this mount */
error = server->nfs_client->rpc_ops->getattr(server, mntfh, fattr);
--
1.7.3.1.g432b3.dirty

2010-11-15 03:07:55

by Joe Perches

[permalink] [raw]
Subject: [PATCH 38/44] include/linux/if_macvlan.h: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
include/linux/if_macvlan.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index 8a2fd66..ac96a2d 100644
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -69,7 +69,7 @@ static inline void macvlan_count_rx(const struct macvlan_dev *vlan,
rx_stats = this_cpu_ptr(vlan->rx_stats);
if (likely(success)) {
u64_stats_update_begin(&rx_stats->syncp);
- rx_stats->rx_packets++;;
+ rx_stats->rx_packets++;
rx_stats->rx_bytes += len;
if (multicast)
rx_stats->rx_multicast++;
--
1.7.3.1.g432b3.dirty

2010-11-15 03:08:55

by Joe Perches

[permalink] [raw]
Subject: [PATCH 34/44] fs/logfs: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
fs/logfs/readwrite.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c
index 6127baf..b4304f2 100644
--- a/fs/logfs/readwrite.c
+++ b/fs/logfs/readwrite.c
@@ -481,7 +481,7 @@ static int inode_write_alias(struct super_block *sb,
val = inode_val0(inode);
break;
case INODE_USED_OFS:
- val = cpu_to_be64(li->li_used_bytes);;
+ val = cpu_to_be64(li->li_used_bytes);
break;
case INODE_SIZE_OFS:
val = cpu_to_be64(i_size_read(inode));
--
1.7.3.1.g432b3.dirty

2010-11-15 03:05:58

by Joe Perches

[permalink] [raw]
Subject: [PATCH 31/44] drivers/xen: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/xen/swiotlb-xen.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 54469c3..65ea21a 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -54,7 +54,7 @@ u64 start_dma_addr;

static dma_addr_t xen_phys_to_bus(phys_addr_t paddr)
{
- return phys_to_machine(XPADDR(paddr)).maddr;;
+ return phys_to_machine(XPADDR(paddr)).maddr;
}

static phys_addr_t xen_bus_to_phys(dma_addr_t baddr)
--
1.7.3.1.g432b3.dirty

2010-11-15 03:06:47

by Joe Perches

[permalink] [raw]
Subject: [PATCH 41/44] net/ipv6/mcast.c: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
net/ipv6/mcast.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index d1444b9..9c50745 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -257,7 +257,7 @@ static struct inet6_dev *ip6_mc_find_dev_rcu(struct net *net,
return NULL;
idev = __in6_dev_get(dev);
if (!idev)
- return NULL;;
+ return NULL;
read_lock_bh(&idev->lock);
if (idev->dead) {
read_unlock_bh(&idev->lock);
--
1.7.3.1.g432b3.dirty

2010-11-15 03:09:15

by Joe Perches

[permalink] [raw]
Subject: [PATCH 33/44] fs/ceph: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
fs/ceph/mds_client.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 3142b15..931124c 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2023,7 +2023,7 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg)
} else {
struct ceph_inode_info *ci = ceph_inode(req->r_inode);
struct ceph_cap *cap =
- ceph_get_cap_for_mds(ci, req->r_mds);;
+ ceph_get_cap_for_mds(ci, req->r_mds);

dout("already using auth");
if ((!cap || cap != ci->i_auth_cap) ||
--
1.7.3.1.g432b3.dirty

2010-11-15 03:09:37

by Joe Perches

[permalink] [raw]
Subject: [PATCH 27/44] drivers/serial: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/serial/mrst_max3110.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/serial/mrst_max3110.c b/drivers/serial/mrst_max3110.c
index b62857b..00d284c 100644
--- a/drivers/serial/mrst_max3110.c
+++ b/drivers/serial/mrst_max3110.c
@@ -56,7 +56,7 @@ struct uart_max3110 {
wait_queue_head_t wq;
struct task_struct *main_thread;
struct task_struct *read_thread;
- struct mutex thread_mutex;;
+ struct mutex thread_mutex;

u32 baud;
u16 cur_conf;
--
1.7.3.1.g432b3.dirty

2010-11-15 03:09:49

by Joe Perches

[permalink] [raw]
Subject: [PATCH 26/44] drivers/scsi/qla2xxx: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/scsi/qla2xxx/qla_isr.c | 4 ++--
drivers/scsi/qla2xxx/qla_nx.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 1f06ddd..59c4870 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -1049,7 +1049,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
}
DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt)));
} else {
- bsg_job->reply->result = DID_OK << 16;;
+ bsg_job->reply->result = DID_OK << 16;
bsg_job->reply->reply_payload_rcv_len =
bsg_job->reply_payload.payload_len;
bsg_job->reply_len = 0;
@@ -1144,7 +1144,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
DEBUG2(qla2x00_dump_buffer((uint8_t *)pkt, sizeof(*pkt)));
}
else {
- bsg_job->reply->result = DID_OK << 16;;
+ bsg_job->reply->result = DID_OK << 16;
bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len;
bsg_job->reply_len = 0;
}
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 8d9edfb..de2d1eb 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -1022,7 +1022,7 @@ ql82xx_rom_lock_d(struct qla_hw_data *ha)
qla_printk(KERN_WARNING, ha, "ROM lock failed\n");
return -1;
}
- return 0;;
+ return 0;
}

static int
--
1.7.3.1.g432b3.dirty

2010-11-15 03:10:04

by Joe Perches

[permalink] [raw]
Subject: [PATCH 24/44] drivers/scsi/lpfc: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/scsi/lpfc/lpfc_bsg.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 7260c3a..9e2c652 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -617,7 +617,7 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job)
dd_data->context_un.iocb.cmdiocbq = cmdiocbq;
dd_data->context_un.iocb.rspiocbq = rspiocbq;
dd_data->context_un.iocb.set_job = job;
- dd_data->context_un.iocb.bmp = NULL;;
+ dd_data->context_un.iocb.bmp = NULL;
dd_data->context_un.iocb.ndlp = ndlp;

if (phba->cfg_poll & DISABLE_FCP_RING_INT) {
--
1.7.3.1.g432b3.dirty

2010-11-15 03:05:43

by Joe Perches

[permalink] [raw]
Subject: [PATCH 19/44] drivers/platform/x86: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/platform/x86/classmate-laptop.c | 2 +-
drivers/platform/x86/thinkpad_acpi.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/classmate-laptop.c b/drivers/platform/x86/classmate-laptop.c
index 341cbfe..d2b7720 100644
--- a/drivers/platform/x86/classmate-laptop.c
+++ b/drivers/platform/x86/classmate-laptop.c
@@ -653,7 +653,7 @@ static void cmpc_keys_handler(struct acpi_device *dev, u32 event)

if ((event & 0x0F) < ARRAY_SIZE(cmpc_keys_codes))
code = cmpc_keys_codes[event & 0x0F];
- inputdev = dev_get_drvdata(&dev->dev);;
+ inputdev = dev_get_drvdata(&dev->dev);
input_report_key(inputdev, code, !(event & 0x10));
}

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 2d61186..3cd7814 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -6345,7 +6345,7 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
"as change notification\n");
tpacpi_hotkey_driver_mask_set(hotkey_driver_mask
| TP_ACPI_HKEY_BRGHTUP_MASK
- | TP_ACPI_HKEY_BRGHTDWN_MASK);;
+ | TP_ACPI_HKEY_BRGHTDWN_MASK);
return 0;
}

--
1.7.3.1.g432b3.dirty

2010-11-15 03:05:42

by Joe Perches

[permalink] [raw]
Subject: [PATCH 20/44] drivers/power: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/power/intel_mid_battery.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/power/intel_mid_battery.c b/drivers/power/intel_mid_battery.c
index 2a10cd3..8397978 100644
--- a/drivers/power/intel_mid_battery.c
+++ b/drivers/power/intel_mid_battery.c
@@ -522,7 +522,7 @@ static int pmic_battery_set_charger(struct pmic_power_module_info *pbi,
if (retval) {
dev_warn(pbi->dev, "%s(): ipc pmic read failed\n",
__func__);
- return retval;;
+ return retval;
}

return 0;
--
1.7.3.1.g432b3.dirty

2010-11-15 03:10:38

by Joe Perches

[permalink] [raw]
Subject: [PATCH 22/44] drivers/scsi/be2iscsi: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/scsi/be2iscsi/be_main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 75a85aa..db60563 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -618,7 +618,7 @@ static void beiscsi_get_params(struct beiscsi_hba *phba)
+ BE2_NOPOUT_REQ));
phba->params.cxns_per_ctrl = phba->fw_config.iscsi_cid_count;
phba->params.asyncpdus_per_ctrl = phba->fw_config.iscsi_cid_count * 2;
- phba->params.icds_per_ctrl = phba->fw_config.iscsi_icd_count;;
+ phba->params.icds_per_ctrl = phba->fw_config.iscsi_icd_count;
phba->params.num_sge_per_io = BE2_SGE;
phba->params.defpdu_hdr_sz = BE2_DEFPDU_HDR_SZ;
phba->params.defpdu_data_sz = BE2_DEFPDU_DATA_SZ;
@@ -781,7 +781,7 @@ static irqreturn_t be_isr(int irq, void *dev_id)
int isr;

phba = dev_id;
- ctrl = &phba->ctrl;;
+ ctrl = &phba->ctrl;
isr = ioread32(ctrl->csr + CEV_ISR0_OFFSET +
(PCI_FUNC(ctrl->pdev->devfn) * CEV_ISR_SIZE));
if (!isr)
--
1.7.3.1.g432b3.dirty

2010-11-15 03:10:37

by Joe Perches

[permalink] [raw]
Subject: [PATCH 23/44] drivers/scsi/bfa: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/scsi/bfa/bfa_fcs_lport.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
index 377cbff..55b3f74 100644
--- a/drivers/scsi/bfa/bfa_fcs_lport.c
+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
@@ -1683,7 +1683,7 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struct bfa_fcs_lport_fdmi_s *fdmi, u8 *pyld)
memcpy(attr->value, fcs_hba_attr->driver_version, attr->len);
attr->len = fc_roundup(attr->len, sizeof(u32));
curr_ptr += sizeof(attr->type) + sizeof(attr->len) + attr->len;
- len += attr->len;;
+ len += attr->len;
count++;
attr->len = cpu_to_be16(attr->len + sizeof(attr->type) +
sizeof(attr->len));
--
1.7.3.1.g432b3.dirty

2010-11-15 03:11:10

by Joe Perches

[permalink] [raw]
Subject: [PATCH 21/44] drivers/s390/net: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/s390/net/qeth_core_sys.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/s390/net/qeth_core_sys.c b/drivers/s390/net/qeth_core_sys.c
index 42fa783..b5e967c 100644
--- a/drivers/s390/net/qeth_core_sys.c
+++ b/drivers/s390/net/qeth_core_sys.c
@@ -372,7 +372,7 @@ static ssize_t qeth_dev_performance_stats_store(struct device *dev,
i = simple_strtoul(buf, &tmp, 16);
if ((i == 0) || (i == 1)) {
if (i == card->options.performance_stats)
- goto out;;
+ goto out;
card->options.performance_stats = i;
if (i == 0)
memset(&card->perf_stats, 0,
--
1.7.3.1.g432b3.dirty

2010-11-15 03:11:33

by Joe Perches

[permalink] [raw]
Subject: [PATCH 18/44] drivers/net/cnic.c: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/cnic.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 92bac19..594ca9c 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -1695,7 +1695,7 @@ static int cnic_bnx2x_iscsi_ofld1(struct cnic_dev *dev, struct kwqe *wqes[],
*work = num;
return -EINVAL;
}
- *work = 2 + req2->num_additional_wqes;;
+ *work = 2 + req2->num_additional_wqes;

l5_cid = req1->iscsi_conn_id;
if (l5_cid >= MAX_ISCSI_TBL_SZ)
--
1.7.3.1.g432b3.dirty

2010-11-15 03:11:34

by Joe Perches

[permalink] [raw]
Subject: [PATCH 17/44] drivers/net/wireless/iwlwifi: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index c2636a7..f293fb6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2420,7 +2420,7 @@ static const char *desc_lookup(u32 num)
max = ARRAY_SIZE(advanced_lookup) - 1;
for (i = 0; i < max; i++) {
if (advanced_lookup[i].num == num)
- break;;
+ break;
}
return advanced_lookup[i].name;
}
--
1.7.3.1.g432b3.dirty

2010-11-15 03:05:39

by Joe Perches

[permalink] [raw]
Subject: [PATCH 14/44] drivers/net/ixgbe: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/ixgbe/ixgbe_sriov.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_sriov.c b/drivers/net/ixgbe/ixgbe_sriov.c
index 5428153..93f40bc 100644
--- a/drivers/net/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ixgbe/ixgbe_sriov.c
@@ -68,7 +68,7 @@ static int ixgbe_set_vf_multicasts(struct ixgbe_adapter *adapter,
* addresses
*/
for (i = 0; i < entries; i++) {
- vfinfo->vf_mc_hashes[i] = hash_list[i];;
+ vfinfo->vf_mc_hashes[i] = hash_list[i];
}

for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) {
--
1.7.3.1.g432b3.dirty

2010-11-15 03:12:40

by Joe Perches

[permalink] [raw]
Subject: [PATCH 13/44] drivers/net/e1000e: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/e1000e/netdev.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index c4ca162..a6d54e4 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4595,7 +4595,7 @@ dma_error:
i += tx_ring->count;
i--;
buffer_info = &tx_ring->buffer_info[i];
- e1000_put_txbuf(adapter, buffer_info);;
+ e1000_put_txbuf(adapter, buffer_info);
}

return 0;
--
1.7.3.1.g432b3.dirty

2010-11-15 03:12:16

by Joe Perches

[permalink] [raw]
Subject: [PATCH 16/44] drivers/net/wireless/ath: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/wireless/ath/ath9k/htc.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index 75ecf6a..4c98b93 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -434,7 +434,7 @@ void ath9k_htc_beaconep(void *drv_priv, struct sk_buff *skb,

void ath9k_htc_station_work(struct work_struct *work);
void ath9k_htc_aggr_work(struct work_struct *work);
-void ath9k_ani_work(struct work_struct *work);;
+void ath9k_ani_work(struct work_struct *work);

int ath9k_tx_init(struct ath9k_htc_priv *priv);
void ath9k_tx_tasklet(unsigned long data);
--
1.7.3.1.g432b3.dirty

2010-11-15 03:05:34

by Joe Perches

[permalink] [raw]
Subject: [PATCH 09/44] drivers/media/video: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/media/video/cx88/cx88-blackbird.c | 2 +-
drivers/media/video/davinci/vpfe_capture.c | 2 +-
drivers/media/video/em28xx/em28xx-cards.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 417d1d5..14b2546 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1065,7 +1065,7 @@ static int mpeg_open(struct file *file)
err = drv->request_acquire(drv);
if(err != 0) {
dprintk(1,"%s: Unable to acquire hardware, %d\n", __func__, err);
- mutex_unlock(&dev->core->lock);;
+ mutex_unlock(&dev->core->lock);
return err;
}
}
diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c
index d8e38cc..14f3d54 100644
--- a/drivers/media/video/davinci/vpfe_capture.c
+++ b/drivers/media/video/davinci/vpfe_capture.c
@@ -1276,7 +1276,7 @@ static int vpfe_videobuf_prepare(struct videobuf_queue *vq,
vb->size = vpfe_dev->fmt.fmt.pix.sizeimage;
vb->field = field;

- ret = videobuf_iolock(vq, vb, NULL);;
+ ret = videobuf_iolock(vq, vb, NULL);
if (ret < 0)
return ret;

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 5485923..7aee7f0 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -2408,7 +2408,7 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
dev->init_data.get_key = em28xx_get_key_em_haup;
dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE:
- dev->init_data.ir_codes = RC_MAP_WINFAST_USBII_DELUXE;;
+ dev->init_data.ir_codes = RC_MAP_WINFAST_USBII_DELUXE;
dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe;
dev->init_data.name = "i2c IR (EM2820 Winfast TV USBII Deluxe)";
break;
--
1.7.3.1.g432b3.dirty

2010-11-15 03:12:54

by Joe Perches

[permalink] [raw]
Subject: [PATCH 12/44] drivers/net/bnx2x: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/bnx2x/bnx2x_link.c | 4 ++--
drivers/net/bnx2x/bnx2x_main.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index 5809196..38aeffe 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -3904,7 +3904,7 @@ static u8 bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) ==
MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_IDLE)
- return 0;;
+ return 0;
msleep(1);
}
return -EINVAL;
@@ -3988,7 +3988,7 @@ static u8 bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) ==
MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_IDLE)
- return 0;;
+ return 0;
msleep(1);
}

diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index e9ad16f..7ffcb08 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -8078,7 +8078,7 @@ static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp)
int port = BP_PORT(bp);
u32 val, val2;
u32 config;
- u32 ext_phy_type, ext_phy_config;;
+ u32 ext_phy_type, ext_phy_config;

bp->link_params.bp = bp;
bp->link_params.port = port;
--
1.7.3.1.g432b3.dirty

2010-11-15 03:13:22

by Joe Perches

[permalink] [raw]
Subject: [PATCH 10/44] drivers/misc: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/misc/bmp085.c | 2 +-
drivers/misc/isl29020.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/bmp085.c b/drivers/misc/bmp085.c
index 63ee4c1..6b8a394 100644
--- a/drivers/misc/bmp085.c
+++ b/drivers/misc/bmp085.c
@@ -216,7 +216,7 @@ static s32 bmp085_get_temperature(struct bmp085_data *data, int *temperature)
*temperature = (x1+x2+8) >> 4;

exit:
- return status;;
+ return status;
}

/*
diff --git a/drivers/misc/isl29020.c b/drivers/misc/isl29020.c
index ca47e62..e6bbf13 100644
--- a/drivers/misc/isl29020.c
+++ b/drivers/misc/isl29020.c
@@ -158,7 +158,7 @@ static int als_set_default_config(struct i2c_client *client)
dev_err(&client->dev, "default write failed.");
return retval;
}
- return 0;;
+ return 0;
}

static int isl29020_probe(struct i2c_client *client,
--
1.7.3.1.g432b3.dirty

2010-11-15 03:05:32

by Joe Perches

[permalink] [raw]
Subject: [PATCH 02/44] arch/microblaze: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
arch/microblaze/lib/memmove.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/microblaze/lib/memmove.c b/arch/microblaze/lib/memmove.c
index 123e361..810fd68 100644
--- a/arch/microblaze/lib/memmove.c
+++ b/arch/microblaze/lib/memmove.c
@@ -182,7 +182,7 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c)
for (; c >= 4; c -= 4) {
value = *--i_src;
*--i_dst = buf_hold | ((value & 0xFF000000)>> 24);
- buf_hold = (value & 0xFFFFFF) << 8;;
+ buf_hold = (value & 0xFFFFFF) << 8;
}
#endif
/* Realign the source */
--
1.7.3.1.g432b3.dirty

2010-11-15 03:13:52

by Joe Perches

[permalink] [raw]
Subject: [PATCH 08/44] drivers/leds: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/leds/leds-mc13783.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
index f05bb08..f369e56 100644
--- a/drivers/leds/leds-mc13783.c
+++ b/drivers/leds/leds-mc13783.c
@@ -234,7 +234,7 @@ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
MC13783_LED_Cx_PERIOD;

if (pdata->flags & MC13783_LED_TRIODE_TC3)
- reg |= MC13783_LED_Cx_TRIODE_TC_BIT;;
+ reg |= MC13783_LED_Cx_TRIODE_TC_BIT;

ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg);
if (ret)
--
1.7.3.1.g432b3.dirty

2010-11-15 03:14:33

by Joe Perches

[permalink] [raw]
Subject: [PATCH 06/44] drivers/i2c: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/i2c/busses/i2c-designware.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c
index b664ed8..a93922d 100644
--- a/drivers/i2c/busses/i2c-designware.c
+++ b/drivers/i2c/busses/i2c-designware.c
@@ -390,7 +390,7 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev)
int tx_limit, rx_limit;
u32 addr = msgs[dev->msg_write_idx].addr;
u32 buf_len = dev->tx_buf_len;
- u8 *buf = dev->tx_buf;;
+ u8 *buf = dev->tx_buf;

intr_mask = DW_IC_INTR_DEFAULT_MASK;

--
1.7.3.1.g432b3.dirty

2010-11-15 03:14:58

by Joe Perches

[permalink] [raw]
Subject: [PATCH 04/44] drivers/cpufreq: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/cpufreq/cpufreq_conservative.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 526bfbf..b0d8f3d 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -118,7 +118,7 @@ static inline cputime64_t get_cpu_idle_time_jiffy(unsigned int cpu,
if (wall)
*wall = (cputime64_t)jiffies_to_usecs(cur_wall_time);

- return (cputime64_t)jiffies_to_usecs(idle_time);;
+ return (cputime64_t)jiffies_to_usecs(idle_time);
}

static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall)
--
1.7.3.1.g432b3.dirty

2010-11-15 03:14:10

by Joe Perches

[permalink] [raw]
Subject: [PATCH 07/44] drivers/isdn: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/isdn/hardware/mISDN/mISDNinfineon.c | 4 ++--
drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
index e90db88..bc0529a 100644
--- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c
+++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
@@ -420,7 +420,7 @@ enable_hwirq(struct inf_hw *hw)
break;
case INF_NICCY:
val = inl((u32)hw->cfg.start + NICCY_IRQ_CTRL_REG);
- val |= NICCY_IRQ_ENABLE;;
+ val |= NICCY_IRQ_ENABLE;
outl(val, (u32)hw->cfg.start + NICCY_IRQ_CTRL_REG);
break;
case INF_SCT_1:
@@ -924,7 +924,7 @@ setup_instance(struct inf_hw *card)
mISDNipac_init(&card->ipac, card);

if (card->ipac.isac.dch.dev.Bprotocols == 0)
- goto error_setup;;
+ goto error_setup;

err = mISDN_register_device(&card->ipac.isac.dch.dev,
&card->pdev->dev, card->name);
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c
index 38eb314..d13fa5b 100644
--- a/drivers/isdn/hardware/mISDN/mISDNisar.c
+++ b/drivers/isdn/hardware/mISDN/mISDNisar.c
@@ -264,7 +264,7 @@ load_firmware(struct isar_hw *isar, const u8 *buf, int size)
while (noc) {
val = le16_to_cpu(*sp++);
*mp++ = val >> 8;
- *mp++ = val & 0xFF;;
+ *mp++ = val & 0xFF;
noc--;
}
spin_lock_irqsave(isar->hwlock, flags);
--
1.7.3.1.g432b3.dirty

2010-11-15 03:14:45

by Joe Perches

[permalink] [raw]
Subject: [PATCH 05/44] drivers/gpio: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
drivers/gpio/langwell_gpio.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpio/langwell_gpio.c b/drivers/gpio/langwell_gpio.c
index 64db9dc..ed05ecb 100644
--- a/drivers/gpio/langwell_gpio.c
+++ b/drivers/gpio/langwell_gpio.c
@@ -122,7 +122,7 @@ static int lnw_gpio_direction_output(struct gpio_chip *chip,
lnw_gpio_set(chip, offset, value);
spin_lock_irqsave(&lnw->lock, flags);
value = readl(gpdr);
- value |= BIT(offset % 32);;
+ value |= BIT(offset % 32);
writel(value, gpdr);
spin_unlock_irqrestore(&lnw->lock, flags);
return 0;
--
1.7.3.1.g432b3.dirty

2010-11-15 03:15:49

by Joe Perches

[permalink] [raw]
Subject: [PATCH 01/44] arch/arm: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
arch/arm/mach-at91/at91cap9_devices.c | 2 +-
arch/arm/mach-at91/at91sam9g45_devices.c | 2 +-
arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
arch/arm/mach-nuc93x/time.c | 2 +-
arch/arm/mach-tegra/tegra2_clocks.c | 2 +-
arch/arm/mach-w90x900/cpu.c | 2 +-
arch/arm/plat-mxc/irq.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c
index d1f775e..308ce7a 100644
--- a/arch/arm/mach-at91/at91cap9_devices.c
+++ b/arch/arm/mach-at91/at91cap9_devices.c
@@ -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);
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index 1e8f275..5e9f8a4 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -256,7 +256,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);
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index 53aaa94..c49262b 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -145,7 +145,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);
diff --git a/arch/arm/mach-nuc93x/time.c b/arch/arm/mach-nuc93x/time.c
index 2f90f9d..f9807c0 100644
--- a/arch/arm/mach-nuc93x/time.c
+++ b/arch/arm/mach-nuc93x/time.c
@@ -82,7 +82,7 @@ static void nuc93x_timer_setup(void)
timer0_load = (rate / TICKS_PER_SEC);
__raw_writel(timer0_load, REG_TICR0);

- val |= (PERIOD | COUNTEN | INTEN | PRESCALE);;
+ val |= (PERIOD | COUNTEN | INTEN | PRESCALE);
__raw_writel(val, REG_TCSR0);

}
diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index ae3b308..7f9d2252 100644
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@ -293,7 +293,7 @@ static int tegra2_super_clk_set_parent(struct clk *c, struct clk *p)
const struct clk_mux_sel *sel;
int shift;

- val = clk_readl(c->reg + SUPER_CLK_MUX);;
+ val = clk_readl(c->reg + SUPER_CLK_MUX);
BUG_ON(((val & SUPER_STATE_MASK) != SUPER_STATE_RUN) &&
((val & SUPER_STATE_MASK) != SUPER_STATE_IDLE));
shift = ((val & SUPER_STATE_MASK) == SUPER_STATE_IDLE) ?
diff --git a/arch/arm/mach-w90x900/cpu.c b/arch/arm/mach-w90x900/cpu.c
index 83c5632..0a235e5 100644
--- a/arch/arm/mach-w90x900/cpu.c
+++ b/arch/arm/mach-w90x900/cpu.c
@@ -60,7 +60,7 @@ static DEFINE_CLK(emc, 7);
static DEFINE_SUBCLK(rmii, 2);
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);
diff --git a/arch/arm/plat-mxc/irq.c b/arch/arm/plat-mxc/irq.c
index 7331f2a..d7809d0 100644
--- a/arch/arm/plat-mxc/irq.c
+++ b/arch/arm/plat-mxc/irq.c
@@ -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;
--
1.7.3.1.g432b3.dirty

2010-11-15 03:15:37

by Joe Perches

[permalink] [raw]
Subject: [PATCH 03/44] arch/um: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
arch/um/drivers/mmapper_kern.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c
index 8501e7d..6256fa9 100644
--- a/arch/um/drivers/mmapper_kern.c
+++ b/arch/um/drivers/mmapper_kern.c
@@ -122,7 +122,7 @@ static int __init mmapper_init(void)
if (err) {
printk(KERN_ERR "mmapper - misc_register failed, err = %d\n",
err);
- return err;;
+ return err;
}
return 0;
}
--
1.7.3.1.g432b3.dirty

2010-11-15 03:27:57

by Jack Wang

[permalink] [raw]
Subject: RE: [PATCH 25/44] drivers/scsi/pm8001: Remove unnecessary semicolons

>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/scsi/pm8001/pm8001_init.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/scsi/pm8001/pm8001_init.c
> b/drivers/scsi/pm8001/pm8001_init.c
> index f8c86b2..be210dd 100644
> --- a/drivers/scsi/pm8001/pm8001_init.c
> +++ b/drivers/scsi/pm8001/pm8001_init.c
> @@ -160,7 +160,7 @@ static void pm8001_free(struct pm8001_hba_info
*pm8001_ha)
> static void pm8001_tasklet(unsigned long opaque)
> {
> struct pm8001_hba_info *pm8001_ha;
> - pm8001_ha = (struct pm8001_hba_info *)opaque;;
> + pm8001_ha = (struct pm8001_hba_info *)opaque;
> if (unlikely(!pm8001_ha))
> BUG_ON(1);
> PM8001_CHIP_DISP->isr(pm8001_ha);
> --
> 1.7.3.1.g432b3.dirty
[Jack Wang] Acked-by: Jack Wang <[email protected]>
Thanks??

2010-11-15 03:57:47

by Grant Likely

[permalink] [raw]
Subject: Re: [PATCH 28/44] drivers/spi: Remove unnecessary semicolons

On Sun, Nov 14, 2010 at 07:04:47PM -0800, Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>

applied, thanks.

g.

> ---
> drivers/spi/amba-pl022.c | 2 +-
> drivers/spi/spi_nuc900.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
> index fb3d1b3..2e50631 100644
> --- a/drivers/spi/amba-pl022.c
> +++ b/drivers/spi/amba-pl022.c
> @@ -956,7 +956,7 @@ static int configure_dma(struct pl022 *pl022)
> tx_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
> break;
> case WRITING_U32:
> - tx_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;;
> + tx_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
> break;
> }
>
> diff --git a/drivers/spi/spi_nuc900.c b/drivers/spi/spi_nuc900.c
> index dff63be..d5be18b 100644
> --- a/drivers/spi/spi_nuc900.c
> +++ b/drivers/spi/spi_nuc900.c
> @@ -449,7 +449,7 @@ err_iomap:
> release_mem_region(hw->res->start, resource_size(hw->res));
> kfree(hw->ioarea);
> err_pdata:
> - spi_master_put(hw->master);;
> + spi_master_put(hw->master);
>
> err_nomem:
> return err;
> --
> 1.7.3.1.g432b3.dirty
>

2010-11-15 06:37:48

by Michal Simek

[permalink] [raw]
Subject: Re: [PATCH 02/44] arch/microblaze: Remove unnecessary semicolons

Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>
> ---
> arch/microblaze/lib/memmove.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

Applied.

Thanks,
Michal

>
> diff --git a/arch/microblaze/lib/memmove.c b/arch/microblaze/lib/memmove.c
> index 123e361..810fd68 100644
> --- a/arch/microblaze/lib/memmove.c
> +++ b/arch/microblaze/lib/memmove.c
> @@ -182,7 +182,7 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c)
> for (; c >= 4; c -= 4) {
> value = *--i_src;
> *--i_dst = buf_hold | ((value & 0xFF000000)>> 24);
> - buf_hold = (value & 0xFFFFFF) << 8;;
> + buf_hold = (value & 0xFFFFFF) << 8;
> }
> #endif
> /* Realign the source */


--
Michal Simek, Ing. (M.Eng)
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian

2010-11-15 07:12:43

by Sjur BRENDELAND

[permalink] [raw]
Subject: RE: [PATCH 39/44] include/net/caif/cfctrl.h: Remove unnecessary semicolons

>
> Signed-off-by: Joe Perches <[email protected]>


Looks good to me.
Acked-by: Sjur Braendeland <[email protected]>

2010-11-15 09:53:00

by Mel Gorman

[permalink] [raw]
Subject: Re: [PATCH 40/44] mm/hugetlb.c: Remove unnecessary semicolons

On Sun, Nov 14, 2010 at 07:04:59PM -0800, Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>
> ---
> mm/hugetlb.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>

Acked-by: Mel Gorman <[email protected]>

> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index c4a3558..8875242 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -540,7 +540,7 @@ static struct page *dequeue_huge_page_vma(struct hstate *h,
>
> /* If reserves cannot be used, ensure enough pages are in the pool */
> if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0)
> - goto err;;
> + goto err;
>
> for_each_zone_zonelist_nodemask(zone, z, zonelist,
> MAX_NR_ZONES - 1, nodemask) {
> --
> 1.7.3.1.g432b3.dirty
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

--
Mel Gorman
Part-time Phd Student Linux Technology Center
University of Limerick IBM Dublin Software Lab

2010-11-15 11:09:28

by Liam Girdwood

[permalink] [raw]
Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons

On Sun, 2010-11-14 at 19:05 -0800, Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>
> ---
> sound/soc/codecs/wm8904.c | 2 +-
> sound/soc/codecs/wm8940.c | 1 -
> sound/soc/codecs/wm8993.c | 2 +-
> sound/soc/codecs/wm_hubs.c | 2 +-
> 4 files changed, 3 insertions(+), 4 deletions(-)

Acked-by: Liam Girdwood <[email protected]>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

2010-11-15 13:49:43

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons

On Sun, Nov 14, 2010 at 07:05:03PM -0800, Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>

This doesn't apply against current -next, could you please regenerate
against that?

2010-11-15 16:25:36

by Rose, Gregory V

[permalink] [raw]
Subject: RE: [PATCH 14/44] drivers/net/ixgbe: Remove unnecessary semicolons

> -----Original Message-----
> From: Joe Perches [mailto:[email protected]]
> Sent: Sunday, November 14, 2010 7:05 PM
> To: Jiri Kosina
> Cc: Kirsher, Jeffrey T; Brandeburg, Jesse; Allan, Bruce W; Wyborny,
> Carolyn; Skidmore, Donald C; Rose, Gregory V; Waskiewicz Jr, Peter P;
> Duyck, Alexander H; Ronciak, John; [email protected];
> [email protected]; [email protected]
> Subject: [PATCH 14/44] drivers/net/ixgbe: Remove unnecessary semicolons
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/net/ixgbe/ixgbe_sriov.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/ixgbe/ixgbe_sriov.c
> b/drivers/net/ixgbe/ixgbe_sriov.c
> index 5428153..93f40bc 100644
> --- a/drivers/net/ixgbe/ixgbe_sriov.c
> +++ b/drivers/net/ixgbe/ixgbe_sriov.c
> @@ -68,7 +68,7 @@ static int ixgbe_set_vf_multicasts(struct ixgbe_adapter
> *adapter,
> * addresses
> */
> for (i = 0; i < entries; i++) {
> - vfinfo->vf_mc_hashes[i] = hash_list[i];;
> + vfinfo->vf_mc_hashes[i] = hash_list[i];
> }
>
> for (i = 0; i < vfinfo->num_vf_mc_hashes; i++) {
> --
> 1.7.3.1.g432b3.dirty

Acked By: Greg Rose <[email protected]>

2010-11-15 17:09:21

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons

Signed-off-by: Joe Perches <[email protected]>
---
V2: against -next

sound/soc/codecs/wm8904.c | 2 +-
sound/soc/codecs/wm8940.c | 1 -
sound/soc/codecs/wm8993.c | 2 +-
sound/soc/codecs/wm_hubs.c | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index be90399..5e57bd2 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -1591,7 +1591,7 @@ static int wm8904_hw_params(struct snd_pcm_substream *substream,
- wm8904->fs);
for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) {
cur_val = abs((wm8904->sysclk_rate /
- clk_sys_rates[i].ratio) - wm8904->fs);;
+ clk_sys_rates[i].ratio) - wm8904->fs);
if (cur_val < best_val) {
best = i;
best_val = cur_val;
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index c2def1b..caed084 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -736,7 +736,6 @@ static int wm8940_probe(struct snd_soc_codec *codec)
return ret;

return ret;
-;
}

static int wm8940_remove(struct snd_soc_codec *codec)
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index bcc54be..991d90c 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -1227,7 +1227,7 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream,
- wm8993->fs);
for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) {
cur_val = abs((wm8993->sysclk_rate /
- clk_sys_rates[i].ratio) - wm8993->fs);;
+ clk_sys_rates[i].ratio) - wm8993->fs);
if (cur_val < best_val) {
best = i;
best_val = cur_val;
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 8aff0ef..422c7fb 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -119,7 +119,7 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec)
switch (hubs->dcs_readback_mode) {
case 0:
reg_l = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_1)
- & WM8993_DCS_INTEG_CHAN_0_MASK;;
+ & WM8993_DCS_INTEG_CHAN_0_MASK;
reg_r = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_2)
& WM8993_DCS_INTEG_CHAN_1_MASK;
break;

2010-11-15 17:30:35

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons

On Mon, Nov 15, 2010 at 09:09:17AM -0800, Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>

Applied, thanks.

Please try to use changelog formats consistent with the code you're
modifying.

2010-11-15 17:34:08

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons

On Mon, 2010-11-15 at 17:30 +0000, Mark Brown wrote:
> On Mon, Nov 15, 2010 at 09:09:17AM -0800, Joe Perches wrote:
> > Signed-off-by: Joe Perches <[email protected]>
> Applied, thanks.
> Please try to use changelog formats consistent with the code you're
> modifying.

I think it's more important to use consistent changelogs
for a patch series.

If you want your own subsystem changelog consistency, I
think you should change the format to what you desire.

cheers, Joe

2010-11-15 18:27:12

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons

On Mon, Nov 15, 2010 at 09:34:04AM -0800, Joe Perches wrote:
> On Mon, 2010-11-15 at 17:30 +0000, Mark Brown wrote:

> > Please try to use changelog formats consistent with the code you're
> > modifying.

> I think it's more important to use consistent changelogs
> for a patch series.

...since...?

> If you want your own subsystem changelog consistency, I
> think you should change the format to what you desire.

Which is what I'm doing but it's annoying to have to constantly hand
edit changelogs.

2010-11-15 18:30:33

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons

On Mon, 2010-11-15 at 18:27 +0000, Mark Brown wrote:
> On Mon, Nov 15, 2010 at 09:34:04AM -0800, Joe Perches wrote:
> > On Mon, 2010-11-15 at 17:30 +0000, Mark Brown wrote:
> > > Please try to use changelog formats consistent with the code you're
> > > modifying.
> > I think it's more important to use consistent changelogs
> > for a patch series.
> ...since...?

1995...

Since there isn't a consistent standard for subsystems
changelogs and automating scripts for the desires of
individual subsystem maintainers is not feasible.

2010-11-15 19:07:09

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 39/44] include/net/caif/cfctrl.h: Remove unnecessary semicolons

From: Joe Perches <[email protected]>
Date: Sun, 14 Nov 2010 19:04:58 -0800

> Signed-off-by: Joe Perches <[email protected]>

Applied.

2010-11-15 19:07:18

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 41/44] net/ipv6/mcast.c: Remove unnecessary semicolons

From: Joe Perches <[email protected]>
Date: Sun, 14 Nov 2010 19:05:00 -0800

> Signed-off-by: Joe Perches <[email protected]>

Applied.

2010-11-15 19:07:25

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 38/44] include/linux/if_macvlan.h: Remove unnecessary semicolons

From: Joe Perches <[email protected]>
Date: Sun, 14 Nov 2010 19:04:57 -0800

> Signed-off-by: Joe Perches <[email protected]>

Applied.

2010-11-15 19:07:33

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 15/44] drivers/net/vxge: Remove unnecessary semicolons

From: Joe Perches <[email protected]>
Date: Sun, 14 Nov 2010 19:04:34 -0800

> Signed-off-by: Joe Perches <[email protected]>

Not applicable to net-next-2.6

2010-11-15 19:07:49

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 21/44] drivers/s390/net: Remove unnecessary semicolons

From: Joe Perches <[email protected]>
Date: Sun, 14 Nov 2010 19:04:40 -0800

> Signed-off-by: Joe Perches <[email protected]>

I'll let the s390 folks take this one.

2010-11-15 19:07:54

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 18/44] drivers/net/cnic.c: Remove unnecessary semicolons

From: Joe Perches <[email protected]>
Date: Sun, 14 Nov 2010 19:04:37 -0800

> Signed-off-by: Joe Perches <[email protected]>

Applied.

2010-11-15 19:07:59

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 14/44] drivers/net/ixgbe: Remove unnecessary semicolons

From: Joe Perches <[email protected]>
Date: Sun, 14 Nov 2010 19:04:33 -0800

> Signed-off-by: Joe Perches <[email protected]>

Applied.

2010-11-15 19:08:06

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 13/44] drivers/net/e1000e: Remove unnecessary semicolons

From: Joe Perches <[email protected]>
Date: Sun, 14 Nov 2010 19:04:32 -0800

> Signed-off-by: Joe Perches <[email protected]>

Applied.

2010-11-15 19:08:13

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 12/44] drivers/net/bnx2x: Remove unnecessary semicolons

From: Joe Perches <[email protected]>
Date: Sun, 14 Nov 2010 19:04:31 -0800

> Signed-off-by: Joe Perches <[email protected]>

Applied.

2010-11-15 19:08:18

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 07/44] drivers/isdn: Remove unnecessary semicolons

From: Joe Perches <[email protected]>
Date: Sun, 14 Nov 2010 19:04:26 -0800

> Signed-off-by: Joe Perches <[email protected]>

Applied.

2010-11-15 19:07:47

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons

On Mon, Nov 15, 2010 at 10:30:29AM -0800, Joe Perches wrote:
> On Mon, 2010-11-15 at 18:27 +0000, Mark Brown wrote:
> > On Mon, Nov 15, 2010 at 09:34:04AM -0800, Joe Perches wrote:

> > > I think it's more important to use consistent changelogs
> > > for a patch series.

> > ...since...?

> 1995...

That's not really a reason. It seems that...

> Since there isn't a consistent standard for subsystems
> changelogs and automating scripts for the desires of
> individual subsystem maintainers is not feasible.

...you mean that you wish to do this since it makes your life as a
script author easier. I'd suggest using pattern matching to look up the
rules for generating the prefixes (it's pretty much entirely prefixes)
in the same way you're handling figuring out who to mail - that'd
probably cover it in an automatable fashion.

2010-11-15 19:14:22

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons

On Mon, 2010-11-15 at 19:07 +0000, Mark Brown wrote:
> I'd suggest using pattern matching to look up the
> rules for generating the prefixes (it's pretty much entirely prefixes)
> in the same way you're handling figuring out who to mail - that'd
> probably cover it in an automatable fashion.

Publish a tool that works and I'll use it.

2010-11-15 19:34:11

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons

On Mon, Nov 15, 2010 at 11:14:18AM -0800, Joe Perches wrote:
> On Mon, 2010-11-15 at 19:07 +0000, Mark Brown wrote:

> > I'd suggest using pattern matching to look up the
> > rules for generating the prefixes (it's pretty much entirely prefixes)
> > in the same way you're handling figuring out who to mail - that'd
> > probably cover it in an automatable fashion.

> Publish a tool that works and I'll use it.

It appears your scripts are already hooked into get_maintainers.pl which
would seem the obvious place to do this? Sadly I don't do perl, though
it looks like you're doing pretty much all the work on that anyway.

The main thing here is to avoid your patches sticking out - as well as
the hassle applying them stuff like this is also a red flag on review.

2010-11-15 19:52:57

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons

On Mon, 2010-11-15 at 19:34 +0000, Mark Brown wrote:
> On Mon, Nov 15, 2010 at 11:14:18AM -0800, Joe Perches wrote:
> > On Mon, 2010-11-15 at 19:07 +0000, Mark Brown wrote:
> > > I'd suggest using pattern matching to look up the
> > > rules for generating the prefixes (it's pretty much entirely prefixes)
> > > in the same way you're handling figuring out who to mail - that'd
> > > probably cover it in an automatable fashion.
> > Publish a tool that works and I'll use it.
> It appears your scripts are already hooked into get_maintainers.pl which
> would seem the obvious place to do this? Sadly I don't do perl, though
> it looks like you're doing pretty much all the work on that anyway.

Sadly, no it's not the right place.

That script just generates cc email addresses
for pre-formatted commit patches.

It'd have to be a script that modifies the git commit subject line
to the taste of the subsystem maintainer.

Right now, I use a commit script that's something like:

#!/bin/bash
echo "$1: Remove unnecessary semicolons" > msg
echo >> msg
#cat >> msg <<EOF
#Unnecessary semicolons should not exist.
#EOF
git commit -s -F msg $1

There could be a modification to $1 (path)
or some such.

Maybe a script like
./scripts/convert_commit_subject_to_subsystem_maintainer_taste
or something.

Care to write one in sh/bash/perl/python/c/ocaml/c#?

As far as I know, the only subsystem pedants^H^H^H^H^Hople
that care much about the commit subject style are
arch/x86 and sound.

I can understand the desire of these subsystem maintainers
to have a consistent style. I think though that requiring
a subject header style without providing more than a
general guideline is a but much.

I'd use any other automated tool you want to provide.

cheers, Joe

2010-11-16 10:49:26

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons

On Mon, Nov 15, 2010 at 11:52:53AM -0800, Joe Perches wrote:
> On Mon, 2010-11-15 at 19:34 +0000, Mark Brown wrote:

> > It appears your scripts are already hooked into get_maintainers.pl which
> > would seem the obvious place to do this? Sadly I don't do perl, though
> > it looks like you're doing pretty much all the work on that anyway.

> Sadly, no it's not the right place.

To query MAINTAINERS? I'd assume that's where you'd want to put that
stuff?

> There could be a modification to $1 (path)
> or some such.
>
> Maybe a script like
> ./scripts/convert_commit_subject_to_subsystem_maintainer_taste
> or something.

> Care to write one in sh/bash/perl/python/c/ocaml/c#?

Like I say I'd expect this to be a get_maintainers based lookup to dump
some data out?

> As far as I know, the only subsystem pedants^H^H^H^H^Hople
> that care much about the commit subject style are
> arch/x86 and sound.

If you look at the kernel you'll see quite a few subsystems which have
some sort of standard practice which they do try to enforce, you
shouldn't take silence as people being happy here - it's taken me some
considerable time to get round to mentioning this, for example, and I
might not have bothered if the patch had applied first time around.
Like working against -next it's one of these things that would make your
patches easier to deal with.

> I can understand the desire of these subsystem maintainers
> to have a consistent style. I think though that requiring
> a subject header style without providing more than a
> general guideline is a but much.

The general guideline I tend to go with is that if what you're doing
looks odd for the code you're submitting against for some reason you're
doing something wrong unless you understand why you're doing something
different and there's a good reason.

> I'd use any other automated tool you want to provide.

Like I say, I'd expect the lookup from the database to be handled by
get_maintainers.pl. Having a separate database would seem odd.

2010-11-16 14:51:21

by Joe Perches

[permalink] [raw]
Subject: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, 2010-11-16 at 10:49 +0000, Mark Brown wrote:
> On Mon, Nov 15, 2010 at 11:52:53AM -0800, Joe Perches wrote:
> > On Mon, 2010-11-15 at 19:34 +0000, Mark Brown wrote:
> > > It appears your scripts are already hooked into get_maintainers.pl which
> > > would seem the obvious place to do this? Sadly I don't do perl, though
> > > it looks like you're doing pretty much all the work on that anyway.
> > Sadly, no it's not the right place.
> To query MAINTAINERS? I'd assume that's where you'd want to put that
> stuff?

I trimmed cc's and added Andrew Morton and Florian Mickler.
First thread link for them: http://lkml.org/lkml/2010/11/15/262

I use get_maintainer to find email addresses with
"git send-email --cc-cmd=" but sure it could be extended
to find some other new information in the MAINTAINERS file.

Anyway, I think that get_maintainers isn't the proper tool
to rewrite commit subject lines, though it could certainly
do the lookup of a key in the MAINTAINERS file.

Maybe add a new MAINTAINERS section line something like:
"C: CommitSubjectGrammarStyle"
where CommitSubjectGrammarStyle is something more
information rich than "style 1", "style 2".

Perhaps you'll propose a grammar to convert path to header
and go through and add these "C:" style entries to the
sections you maintain.

Also, what would you expect the output to be when a single
patch modified files from 2 subsystems that use different
styles?

cheers, Joe

2010-11-16 15:04:55

by Mark Brown

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, Nov 16, 2010 at 06:51:17AM -0800, Joe Perches wrote:

> Maybe add a new MAINTAINERS section line something like:
> "C: CommitSubjectGrammarStyle"
> where CommitSubjectGrammarStyle is something more
> information rich than "style 1", "style 2".

Something printfish would seem reasonable?

> Also, what would you expect the output to be when a single
> patch modified files from 2 subsystems that use different
> styles?

The traditional thing is "ThingX/ThingY: blah" but as with anything else
you need to be sensible.

2010-11-16 17:37:38

by Florian Mickler

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, 16 Nov 2010 06:51:17 -0800
Joe Perches <[email protected]> wrote:

> On Tue, 2010-11-16 at 10:49 +0000, Mark Brown wrote:
> > On Mon, Nov 15, 2010 at 11:52:53AM -0800, Joe Perches wrote:
> > > On Mon, 2010-11-15 at 19:34 +0000, Mark Brown wrote:
> > > > It appears your scripts are already hooked into get_maintainers.pl which
> > > > would seem the obvious place to do this? Sadly I don't do perl, though
> > > > it looks like you're doing pretty much all the work on that anyway.
> > > Sadly, no it's not the right place.
> > To query MAINTAINERS? I'd assume that's where you'd want to put that
> > stuff?
>
> I trimmed cc's and added Andrew Morton and Florian Mickler.
> First thread link for them: http://lkml.org/lkml/2010/11/15/262
>
> I use get_maintainer to find email addresses with
> "git send-email --cc-cmd=" but sure it could be extended
> to find some other new information in the MAINTAINERS file.
>
> Anyway, I think that get_maintainers isn't the proper tool
> to rewrite commit subject lines, though it could certainly
> do the lookup of a key in the MAINTAINERS file.
>
> Maybe add a new MAINTAINERS section line something like:
> "C: CommitSubjectGrammarStyle"
> where CommitSubjectGrammarStyle is something more
> information rich than "style 1", "style 2".
>
> Perhaps you'll propose a grammar to convert path to header
> and go through and add these "C:" style entries to the
> sections you maintain.
>
> Also, what would you expect the output to be when a single
> patch modified files from 2 subsystems that use different
> styles?
>
> cheers, Joe
>

My first reaction to this is, it's silly. Certainly a
subsystem-maintainer is capable of hacking something together that
suits his needs or may just use a good editor to get the job done.
After all, he might want to edit the commit message anyway. Also he has
to have his act together for all non-conforming submitters anyway,
because shurely, telling people to re-edit their patches subject line
is not what one would consider "welcoming to newbies", or whatever it
is kernel subsystem maintainers have to be nowadays *g*...

On second thought, if that facility existed, i think nobody would mind
it either. So, why not. I don't see a way to specify what to do with
cross-subsystem patches though.

(MAINTAINERS seems to be the logical place to put this
information.)

Regards,
Flo

2010-11-16 18:12:30

by Mark Brown

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, Nov 16, 2010 at 06:37:07PM +0100, Florian Mickler wrote:

> My first reaction to this is, it's silly. Certainly a
> subsystem-maintainer is capable of hacking something together that
> suits his needs or may just use a good editor to get the job done.
> After all, he might want to edit the commit message anyway. Also he has
> to have his act together for all non-conforming submitters anyway,
> because shurely, telling people to re-edit their patches subject line
> is not what one would consider "welcoming to newbies", or whatever it
> is kernel subsystem maintainers have to be nowadays *g*...

So, my general policy on this is that I tend to push back on patches
which don't just work with the toolset (subject lines are just one part
of it) to a variable extent depending on who's submitting and what
they're submitting. One of the factors is that the more patches are
coming from someone the easier I expect their patches to be to work
with.

The reason this came up is that this is one of the issues with Joe's
patches (which are rather frequent) but he is only willing to do things
that he can automate.

> (MAINTAINERS seems to be the logical place to put this
> information.)

Indeed.

2010-11-16 19:35:54

by Florian Mickler

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, 16 Nov 2010 18:12:27 +0000
Mark Brown <[email protected]> wrote:

> On Tue, Nov 16, 2010 at 06:37:07PM +0100, Florian Mickler wrote:
>
> > My first reaction to this is, it's silly. Certainly a
> > subsystem-maintainer is capable of hacking something together that
> > suits his needs or may just use a good editor to get the job done.
> > After all, he might want to edit the commit message anyway. Also he has
> > to have his act together for all non-conforming submitters anyway,
> > because shurely, telling people to re-edit their patches subject line
> > is not what one would consider "welcoming to newbies", or whatever it
> > is kernel subsystem maintainers have to be nowadays *g*...
>
> So, my general policy on this is that I tend to push back on patches
> which don't just work with the toolset (subject lines are just one part
> of it) to a variable extent depending on who's submitting and what
> they're submitting. One of the factors is that the more patches are
> coming from someone the easier I expect their patches to be to work
> with.
>
> The reason this came up is that this is one of the issues with Joe's
> patches (which are rather frequent) but he is only willing to do things
> that he can automate.

Hehe, I know that I wouldn't want to hand edit every autogenerated patch
people throw at me... What about just dropping everything before the
last "]" or ":" and putting an autogenerated prefix before it in a
pre-commit hook on your side?

That should work most of the time... don't know... maybe other
subsystem maintainers have some more suggestions on reducing the
workload... this could even be an interesting topic for some summit...

Regards,
Flo

2010-11-16 19:55:34

by Mark Brown

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, Nov 16, 2010 at 08:35:22PM +0100, Florian Mickler wrote:

> Hehe, I know that I wouldn't want to hand edit every autogenerated patch
> people throw at me... What about just dropping everything before the
> last "]" or ":" and putting an autogenerated prefix before it in a
> pre-commit hook on your side?

> That should work most of the time... don't know... maybe other

It's the most of the time bit that worries me, I'm generally reluctant
to script things like this when the scripts aren't very widely used and
it's a pain to get hooks distributed over all my systems and working for
all the things I need to apply patches for.

>From my point of view my current approach is actually working pretty
well with most submitters, even people doing similar janitorial stuff.

2010-11-16 20:21:09

by Randy Dunlap

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, 16 Nov 2010 19:55:31 +0000 Mark Brown wrote:

> On Tue, Nov 16, 2010 at 08:35:22PM +0100, Florian Mickler wrote:
>
> > Hehe, I know that I wouldn't want to hand edit every autogenerated patch
> > people throw at me... What about just dropping everything before the
> > last "]" or ":" and putting an autogenerated prefix before it in a
> > pre-commit hook on your side?
>
> > That should work most of the time... don't know... maybe other
>
> It's the most of the time bit that worries me, I'm generally reluctant
> to script things like this when the scripts aren't very widely used and
> it's a pain to get hooks distributed over all my systems and working for
> all the things I need to apply patches for.
>
> From my point of view my current approach is actually working pretty
> well with most submitters, even people doing similar janitorial stuff.

I don't know what you asked Joe to change, but asking someone to use
the documented canonical patch format:

<quote>
The canonical patch subject line is:

Subject: [PATCH 001/123] subsystem: summary phrase
</quote>

should be fine. And there is no need for printf-ish templates
for this in MAINTAINERS either.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

2010-11-16 20:42:39

by Joe Perches

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, 2010-11-16 at 12:21 -0800, Randy Dunlap wrote:
> On Tue, 16 Nov 2010 19:55:31 +0000 Mark Brown wrote:
> I don't know what you asked Joe to change, but asking someone to use
> the documented canonical patch format:
> <quote>
> The canonical patch subject line is:
> Subject: [PATCH 001/123] subsystem: summary phrase
> </quote>
> should be fine. And there is no need for printf-ish templates
> for this in MAINTAINERS either.

I've never read that before. Learn something new etc...
It seems path prefixes aren't good nor even commonly used.

A review of kernel patch subjects:

$ git log --no-merges --pretty=oneline | \
cut -f2- -d" " | cut -f1 -d: | sort | uniq -c | sort -rn

is interesting. Here's the head:
5007 x86
3943 Staging
3220 USB
2790 sh
2707 KVM
2624 ARM
2449 ALSA
1571 Input
1549 ASoC
1470 iwlwifi
1423 ACPI
1397 mac80211
1384 V4L/DVB
1226 sched
1200 Btrfs
1184 powerpc
1106 [NETFILTER]
1080 MIPS
1049 net
1047 ide
1014 drm/i915
993 staging
921 ath9k

Some subsystem maintainers like upper case, some mixed, some lower.
Some aren't consistent. (Staging/staging)

It doesn't seem a rule can be pregenerated so maybe adding these
"C:" lines to MAINTAINERS has some value.

2010-11-16 20:46:17

by Randy Dunlap

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, 16 Nov 2010 12:42:36 -0800 Joe Perches wrote:

> On Tue, 2010-11-16 at 12:21 -0800, Randy Dunlap wrote:
> > On Tue, 16 Nov 2010 19:55:31 +0000 Mark Brown wrote:
> > I don't know what you asked Joe to change, but asking someone to use
> > the documented canonical patch format:
> > <quote>
> > The canonical patch subject line is:
> > Subject: [PATCH 001/123] subsystem: summary phrase
> > </quote>
> > should be fine. And there is no need for printf-ish templates
> > for this in MAINTAINERS either.
>
> I've never read that before. Learn something new etc...
> It seems path prefixes aren't good nor even commonly used.
>
> A review of kernel patch subjects:
>
> $ git log --no-merges --pretty=oneline | \
> cut -f2- -d" " | cut -f1 -d: | sort | uniq -c | sort -rn
>
> is interesting. Here's the head:
> 5007 x86
> 3943 Staging
> 3220 USB
> 2790 sh
> 2707 KVM
> 2624 ARM
> 2449 ALSA
> 1571 Input
> 1549 ASoC
> 1470 iwlwifi
> 1423 ACPI
> 1397 mac80211
> 1384 V4L/DVB
> 1226 sched
> 1200 Btrfs
> 1184 powerpc
> 1106 [NETFILTER]
> 1080 MIPS
> 1049 net
> 1047 ide
> 1014 drm/i915
> 993 staging
> 921 ath9k

$ARCH is a commonly accepted substitute for subsystem.

And yes, lots of people use <drivername> there as well.


> Some subsystem maintainers like upper case, some mixed, some lower.
> Some aren't consistent. (Staging/staging)

Case usually doesn't matter to most of us.

> It doesn't seem a rule can be pregenerated so maybe adding these
> "C:" lines to MAINTAINERS has some value.

Hopefully it won't go that far.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

2010-11-16 23:01:21

by Mark Brown

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, Nov 16, 2010 at 12:21:02PM -0800, Randy Dunlap wrote:

> I don't know what you asked Joe to change, but asking someone to use
> the documented canonical patch format:

> <quote>
> The canonical patch subject line is:

> Subject: [PATCH 001/123] subsystem: summary phrase
> </quote>

> should be fine. And there is no need for printf-ish templates
> for this in MAINTAINERS either.

That's exactly what I asked him to do. He said he's not willing to use
anything for "subsystem" which can't be automatically generated.

The formats I mentioned because some subsystems have their own things
within this format like "subsystem: driver:" or whatever. While it's
probably not an issue for the sort of patch Joe generates if we do have
a tool for this I'd expect it'll go the same way that checkpatch does
and get used by people doing more specific work. It'd be good to try to
head off the friction that may cause by at least having an idea how we
might cope with that.

2010-11-16 23:22:53

by Mark Brown

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, Nov 16, 2010 at 12:46:09PM -0800, Randy Dunlap wrote:
> On Tue, 16 Nov 2010 12:42:36 -0800 Joe Perches wrote:

> > Some subsystem maintainers like upper case, some mixed, some lower.
> > Some aren't consistent. (Staging/staging)

> Case usually doesn't matter to most of us.

Given that we're working in case sensitive languages here it's probably
safe to assume that a reasonable proportion of people will care; being
reasonably consistent with existing practice for the subsystem seems
sensible.

2010-11-16 23:28:45

by Randy Dunlap

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, 16 Nov 2010 23:22:58 +0000 Mark Brown wrote:

> On Tue, Nov 16, 2010 at 12:46:09PM -0800, Randy Dunlap wrote:
> > On Tue, 16 Nov 2010 12:42:36 -0800 Joe Perches wrote:
>
> > > Some subsystem maintainers like upper case, some mixed, some lower.
> > > Some aren't consistent. (Staging/staging)
>
> > Case usually doesn't matter to most of us.
>
> Given that we're working in case sensitive languages here it's probably
> safe to assume that a reasonable proportion of people will care; being
> reasonably consistent with existing practice for the subsystem seems
> sensible.

Greg takes patches that say STAGING or Staging or staging.

DaveM takes patches that say net: or netdev: or network: or NET:

The sound maintainers take patches that say sound: or alsa: or ALSA:

etc.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

2010-11-16 23:50:21

by Mark Brown

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, Nov 16, 2010 at 03:28:35PM -0800, Randy Dunlap wrote:
> On Tue, 16 Nov 2010 23:22:58 +0000 Mark Brown wrote:
> > On Tue, Nov 16, 2010 at 12:46:09PM -0800, Randy Dunlap wrote:

> > > Case usually doesn't matter to most of us.

> > Given that we're working in case sensitive languages here it's probably
> > safe to assume that a reasonable proportion of people will care; being
> > reasonably consistent with existing practice for the subsystem seems
> > sensible.

> Greg takes patches that say STAGING or Staging or staging.

> DaveM takes patches that say net: or netdev: or network: or NET:

> The sound maintainers take patches that say sound: or alsa: or ALSA:

> etc.

...and best practice would be to pay attention to what the standard
thing is for the subsystem and follow that. We shouldn't be suggesting
that people just ignore the case, though obviously if it's not clear
then it's not worth worrying too much about it.

2010-11-16 23:58:00

by Joe Perches

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, 2010-11-16 at 23:22 +0000, Mark Brown wrote:
> On Tue, Nov 16, 2010 at 12:46:09PM -0800, Randy Dunlap wrote:
> > On Tue, 16 Nov 2010 12:42:36 -0800 Joe Perches wrote:
> > > Some subsystem maintainers like upper case, some mixed, some lower.
> > > Some aren't consistent. (Staging/staging)
> > Case usually doesn't matter to most of us.
> Given that we're working in case sensitive languages here it's probably
> safe to assume that a reasonable proportion of people will care; being
> reasonably consistent with existing practice for the subsystem seems
> sensible.

Presumably the tool would also have to traverse up the tree
to find the appropriate style so every MAINTAINERS section
would not need a C entry.

ie: sound/soc/codecs/foo could use the C: entry for sound/soc/

Perhaps something like:
C: ASoC basename:

and for arch/x86/:
C: x86, dirname:

etc.

2010-11-16 23:57:58

by Joe Perches

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, 2010-11-16 at 15:28 -0800, Randy Dunlap wrote:
> On Tue, 16 Nov 2010 23:22:58 +0000 Mark Brown wrote:
> > On Tue, Nov 16, 2010 at 12:46:09PM -0800, Randy Dunlap wrote:
> > > On Tue, 16 Nov 2010 12:42:36 -0800 Joe Perches wrote:
> > > > Some subsystem maintainers like upper case, some mixed, some lower.
> > > > Some aren't consistent. (Staging/staging)
> > > Case usually doesn't matter to most of us.
> > Given that we're working in case sensitive languages here it's probably
> > safe to assume that a reasonable proportion of people will care; being
> > reasonably consistent with existing practice for the subsystem seems
> > sensible.
> Greg takes patches that say STAGING or Staging or staging.

Greg seems to rewrite patch subjects and is inconsistent
about case, so he might be doing that by hand.

> DaveM takes patches that say net: or netdev: or network: or NET:

DaveM doesn't appear to be choosy about patch subject lines.
He seems to take any sensible patch and as far as I know he
doesn't edit the subject lines. He does reject inferior
patches outright.

> The sound maintainers take patches that say sound: or alsa: or ALSA:

The sound maintainers seem to rewrite patch subjects on an
ad-hoc basis.

2010-11-17 00:11:53

by Joel Becker

[permalink] [raw]
Subject: Re: [PATCH 36/44] fs/ocfs2: Remove unnecessary semicolons

On Sun, Nov 14, 2010 at 07:04:55PM -0800, Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>

Acked-by: Joel Becker <[email protected]>


> ---
> fs/ocfs2/refcounttree.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
> index b5f9160..da14a42 100644
> --- a/fs/ocfs2/refcounttree.c
> +++ b/fs/ocfs2/refcounttree.c
> @@ -3704,7 +3704,7 @@ int ocfs2_refcount_cow_xattr(struct inode *inode,
> context->cow_start = cow_start;
> context->cow_len = cow_len;
> context->ref_tree = ref_tree;
> - context->ref_root_bh = ref_root_bh;;
> + context->ref_root_bh = ref_root_bh;
> context->cow_object = xv;
>
> context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_jbd;
> --
> 1.7.3.1.g432b3.dirty
>

--

Life's Little Instruction Book #237

"Seek out the good in people."

Joel Becker
Senior Development Manager
Oracle
E-mail: [email protected]
Phone: (650) 506-8127

2010-11-17 00:45:20

by Stefan Richter

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Nov 16 Mark Brown wrote:
> On Tue, Nov 16, 2010 at 12:21:02PM -0800, Randy Dunlap wrote:
>
> > I don't know what you asked Joe to change, but asking someone to use
> > the documented canonical patch format:
>
> > <quote>
> > The canonical patch subject line is:
>
> > Subject: [PATCH 001/123] subsystem: summary phrase
> > </quote>
>
> > should be fine. And there is no need for printf-ish templates
> > for this in MAINTAINERS either.
>
> That's exactly what I asked him to do. He said he's not willing to use
> anything for "subsystem" which can't be automatically generated.

Why should we codify our conventions in MAINTAINERS to accommodate the
specific problem of virtually a _single_ patch author?

Conventions are living and are being adjusted all the time, as code
organization changes, people join and go, projects start and cease.

Said author please looks the conventions up in the git history. If he
finds that this decelerates his patch generation rate, he can surely
code a script that looks into git for him and suggests plausible
prefixes for his patch titles to him. Or he can collect a kind of
database (a config file) locally for his own use in which he records
conventional prefixes on the go.
--
Stefan Richter
-=====-==-=- =-== =---=
http://arcgraph.de/sr/

2010-11-17 00:53:38

by Jiri Kosina

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Wed, 17 Nov 2010, Stefan Richter wrote:

> > > I don't know what you asked Joe to change, but asking someone to use
> > > the documented canonical patch format:
> >
> > > <quote>
> > > The canonical patch subject line is:
> >
> > > Subject: [PATCH 001/123] subsystem: summary phrase
> > > </quote>
> >
> > > should be fine. And there is no need for printf-ish templates
> > > for this in MAINTAINERS either.
> >
> > That's exactly what I asked him to do. He said he's not willing to use
> > anything for "subsystem" which can't be automatically generated.
>
> Why should we codify our conventions in MAINTAINERS to accommodate the
> specific problem of virtually a _single_ patch author?
>
> Conventions are living and are being adjusted all the time, as code
> organization changes, people join and go, projects start and cease.
>
> Said author please looks the conventions up in the git history. If he
> finds that this decelerates his patch generation rate, he can surely
> code a script that looks into git for him and suggests plausible
> prefixes for his patch titles to him. Or he can collect a kind of
> database (a config file) locally for his own use in which he records
> conventional prefixes on the go.

Come on guys, this debate is really horribly boring.

Either the maintainer wants the patch. Then he is certainly able to apply
it no matter the subject line (I personally am getting a lot of patches
which don't follow the format I am using in my tree ... converting
Subject: lines is so trivial that I have never felt like bothering anyone
about it ... it's basically single condition in a shellscript). Or the
maintainer doesn't feel like the patch is worth it, and then the
subject-line format really doesn't matter.

--
Jiri Kosina
SUSE Labs, Novell Inc.

2010-11-17 00:56:01

by Randy Dunlap

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Tue, 16 Nov 2010 15:57:55 -0800 Joe Perches wrote:

> On Tue, 2010-11-16 at 15:28 -0800, Randy Dunlap wrote:
> > On Tue, 16 Nov 2010 23:22:58 +0000 Mark Brown wrote:
> > > On Tue, Nov 16, 2010 at 12:46:09PM -0800, Randy Dunlap wrote:
> > > > On Tue, 16 Nov 2010 12:42:36 -0800 Joe Perches wrote:
> > > > > Some subsystem maintainers like upper case, some mixed, some lower.
> > > > > Some aren't consistent. (Staging/staging)
> > > > Case usually doesn't matter to most of us.
> > > Given that we're working in case sensitive languages here it's probably
> > > safe to assume that a reasonable proportion of people will care; being
> > > reasonably consistent with existing practice for the subsystem seems
> > > sensible.
> > Greg takes patches that say STAGING or Staging or staging.
>
> Greg seems to rewrite patch subjects and is inconsistent
> about case, so he might be doing that by hand.
>
> > DaveM takes patches that say net: or netdev: or network: or NET:
>
> DaveM doesn't appear to be choosy about patch subject lines.
> He seems to take any sensible patch and as far as I know he
> doesn't edit the subject lines. He does reject inferior
> patches outright.
>
> > The sound maintainers take patches that say sound: or alsa: or ALSA:
>
> The sound maintainers seem to rewrite patch subjects on an
> ad-hoc basis.

OK, I can accept your summary.
However, I can't tell that we are making any progress.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

2010-11-17 17:07:51

by Mark Brown

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Wed, Nov 17, 2010 at 01:53:35AM +0100, Jiri Kosina wrote:
> On Wed, 17 Nov 2010, Stefan Richter wrote:

> > Why should we codify our conventions in MAINTAINERS to accommodate the
> > specific problem of virtually a _single_ patch author?

It seems to be the way we're heading in general - look at all the recent
work on MAINTAINERS and get_maintainer.pl. There seems to be a genral
push to make all this stuff automatable.

> Either the maintainer wants the patch. Then he is certainly able to apply
> it no matter the subject line (I personally am getting a lot of patches
> which don't follow the format I am using in my tree ... converting
> Subject: lines is so trivial that I have never felt like bothering anyone
> about it ... it's basically single condition in a shellscript). Or the

It's slightly more than that if you're dealing with more than one area,
and I also find this sort of stuff is a good flag for scrubbing the
patch in greater detail - when patches stand out from a 1000ft visual
overview there's a fair chance that there's other issues so if people
regularly submit good patches that have only cosmetic issues I find it's
worth guiding them away from that.

> maintainer doesn't feel like the patch is worth it, and then the
> subject-line format really doesn't matter.

In this case if I don't apply it it's likely to end up going in via your
tree and then I'll still have to deal with the merge conflicts which are
more annoying.

2010-11-17 19:33:08

by Pavel Machek

[permalink] [raw]
Subject: Re: [PATCH 44/44] sound/soc/codecs: Remove unnecessary semicolons

On Mon 2010-11-15 09:34:04, Joe Perches wrote:
> On Mon, 2010-11-15 at 17:30 +0000, Mark Brown wrote:
> > On Mon, Nov 15, 2010 at 09:09:17AM -0800, Joe Perches wrote:
> > > Signed-off-by: Joe Perches <[email protected]>
> > Applied, thanks.
> > Please try to use changelog formats consistent with the code you're
> > modifying.
>
> I think it's more important to use consistent changelogs
> for a patch series.

And I agree here. Having to learn code-style quirks for patches is
bad, having to learn new changelog style for each subsystem is very
bad.
Pavel

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

2010-11-17 21:07:55

by Stefan Richter

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Nov 17 Mark Brown wrote:
> On Wed, Nov 17, 2010 at 01:53:35AM +0100, Jiri Kosina wrote:
> > On Wed, 17 Nov 2010, Stefan Richter wrote:
>
> > > Why should we codify our conventions in MAINTAINERS to accommodate the
> > > specific problem of virtually a _single_ patch author?
>
> It seems to be the way we're heading in general - look at all the recent
> work on MAINTAINERS and get_maintainer.pl. There seems to be a genral
> push to make all this stuff automatable.

get_maintainer.pl, used with judgment and together with "gitk
the/patched/source.c" is nice not only for people like Joe who
regularly work tree-wide but also for ones like me who only rarely want
to submit a bug report or patch for a subsystem with they are
unfamiliar with.

But the thought of a database of "how to start a good patch title" is
far-fetched. Really, as a patch author, just look how other people
write patch titles and judge whether this is good for your work too or
not.

> > Either the maintainer wants the patch. Then he is certainly able to apply
> > it no matter the subject line (I personally am getting a lot of patches
> > which don't follow the format I am using in my tree ... converting
> > Subject: lines is so trivial that I have never felt like bothering anyone
> > about it ... it's basically single condition in a shellscript). Or the
>
> It's slightly more than that if you're dealing with more than one area,
> and I also find this sort of stuff is a good flag for scrubbing the
> patch in greater detail - when patches stand out from a 1000ft visual
> overview there's a fair chance that there's other issues so if people
> regularly submit good patches that have only cosmetic issues I find it's
> worth guiding them away from that.

On one hand Jiri is right that maintainers can adjust title prefixes ad
hoc. (Downside: Weaker connection to mailinglist archives.) On the
other hand, in the case of long-term prolific authors like Joe it is
more optimal if there is a good patch title right from the outset.

So, if this boring thread does at least yield the conclusion that
${path}/${filename}: is a bad title prefix, at least something was
won. :-)

Another thought: Whether a typical part of a mass conversion, e.g. to
use a new helper macro without change of functionality, is named

[PATCH] [subsystem] driver: use foo_bar helper
or
[PATCH] use foo_bar helper in subsystem, driver

does not really matter, does it? This change is more about the helper
than about the driver. It is really a different kind of changeset than
a functional change that we want to be called

[PATCH] [subsystem] driver: fix crash at disconnection

or so. This is something that those who look for release notes of
that driver or subsystem want to grep in the changelog.

Or in other words: If you as patch author wonder what would be a good
title for your patch, then ask yourself: How should this change show up
in kernel release notes that are constructed from the git shortlog?
Sometimes the answer to this question includes among else a prefix with
a canonical subsystem name (even case sensitive, with brackets or
colon), whereas other times such formalities are utterly pointless.

[Sorry for the spent electrons. But OTOH, issues like (1.) optimum
use of reviewer bandwidth, (2.) kernel changelog alias release
notes /do/ matter.]
--
Stefan Richter
-=====-==-=- =-== =---=
http://arcgraph.de/sr/

2010-11-17 23:49:23

by Joe Perches

[permalink] [raw]
Subject: Re: rfc: rewrite commit subject line for subsystem maintainer preference tool

On Wed, 2010-11-17 at 22:07 +0100, Stefan Richter wrote:
> So, if this boring thread does at least yield the conclusion that
> ${path}/${filename}: is a bad title prefix, at least something was
> won. :-)

I've changed my scripts to use this style:

Subject: [PATCH] $(basename $(dirname $file)): commit desc...

until a better tool is available.

2010-11-19 13:21:36

by Artem Bityutskiy

[permalink] [raw]
Subject: Re: [PATCH 37/44] fs/ubifs: Remove unnecessary semicolons

On Sun, 2010-11-14 at 19:04 -0800, Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>
> ---
> fs/ubifs/scan.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

Thanks, I'll pick this up.

--
Best Regards,
Artem Bityutskiy (Артём Битюцкий)

2010-11-22 06:44:23

by Takashi Iwai

[permalink] [raw]
Subject: Re: [PATCH 43/44] sound/core/pcm_lib.c: Remove unnecessary semicolons

At Sun, 14 Nov 2010 19:05:02 -0800,
Joe Perches wrote:
>
> Signed-off-by: Joe Perches <[email protected]>

Applied now. Thanks.


Takashi


> ---
> sound/core/pcm_lib.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
> index a1707cc..b75db8e 100644
> --- a/sound/core/pcm_lib.c
> +++ b/sound/core/pcm_lib.c
> @@ -223,7 +223,7 @@ static void xrun_log(struct snd_pcm_substream *substream,
> entry->jiffies = jiffies;
> entry->pos = pos;
> entry->period_size = runtime->period_size;
> - entry->buffer_size = runtime->buffer_size;;
> + entry->buffer_size = runtime->buffer_size;
> entry->old_hw_ptr = runtime->status->hw_ptr;
> entry->hw_ptr_base = runtime->hw_ptr_base;
> log->idx = (log->idx + 1) % XRUN_LOG_CNT;
> --
> 1.7.3.1.g432b3.dirty
>

2010-12-05 03:32:37

by Chris Ball

[permalink] [raw]
Subject: Re: [PATCH 11/44] drivers/mmc: Remove unnecessary semicolons

Hi Joe,

On Sun, Nov 14, 2010 at 07:04:30PM -0800, Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/mmc/host/davinci_mmc.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
> index e15547c..b643dde 100644
> --- a/drivers/mmc/host/davinci_mmc.c
> +++ b/drivers/mmc/host/davinci_mmc.c
> @@ -480,7 +480,7 @@ static void mmc_davinci_send_dma_request(struct mmc_davinci_host *host,
> struct scatterlist *sg;
> unsigned sg_len;
> unsigned bytes_left = host->bytes_left;
> - const unsigned shift = ffs(rw_threshold) - 1;;
> + const unsigned shift = ffs(rw_threshold) - 1;
>
> if (host->data_dir == DAVINCI_MMC_DATADIR_WRITE) {
> template = &host->tx_template;
> --

Pushed to mmc-next for .38, thanks.

--
Chris Ball <[email protected]> <http://printf.net/>
One Laptop Per Child