aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin P. Mattock <justinmattock@gmail.com>2011-07-27 02:06:29 -0400
committerJiri Kosina <jkosina@suse.cz>2011-09-15 08:50:49 -0400
commit699324871fcc3650f2023c5e36cb119a92d7894b (patch)
tree7115a8183a4fd00b6f0ea1ae3b8f3dfbcf1c454b
parentca4a04cf3dd0cecb5e7188ed7796cc55fc13aeb1 (diff)
treewide: remove extra semicolons from various parts of the kernel
This is a resend from the original, changing the title from PATCH to RFC(since this is a review for commit, and I should have put that the first go around). and also removing some of the commit's with ia64 and bash since it is significant. let me know if I might have missed anything etc.. Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--arch/arm/mach-nuc93x/time.c2
-rw-r--r--arch/arm/mach-w90x900/cpu.c2
-rw-r--r--drivers/block/rbd.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_fence.c2
-rw-r--r--drivers/i2c/busses/i2c-designware.c2
-rw-r--r--drivers/media/radio/wl128x/fmdrv_v4l2.c2
-rw-r--r--drivers/scsi/isci/phy.c2
-rw-r--r--drivers/staging/iio/addac/adt7316-i2c.c2
-rw-r--r--drivers/staging/iio/dds/ad9832.c2
-rw-r--r--drivers/usb/gadget/mv_udc_core.c4
-rwxr-xr-xscripts/checkpatch.pl4
11 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-nuc93x/time.c b/arch/arm/mach-nuc93x/time.c
index 2f90f9dc6e30..f9807c029ec5 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)
82 timer0_load = (rate / TICKS_PER_SEC); 82 timer0_load = (rate / TICKS_PER_SEC);
83 __raw_writel(timer0_load, REG_TICR0); 83 __raw_writel(timer0_load, REG_TICR0);
84 84
85 val |= (PERIOD | COUNTEN | INTEN | PRESCALE);; 85 val |= (PERIOD | COUNTEN | INTEN | PRESCALE);
86 __raw_writel(val, REG_TCSR0); 86 __raw_writel(val, REG_TCSR0);
87 87
88} 88}
diff --git a/arch/arm/mach-w90x900/cpu.c b/arch/arm/mach-w90x900/cpu.c
index 83c56324a472..0a235e502330 100644
--- a/arch/arm/mach-w90x900/cpu.c
+++ b/arch/arm/mach-w90x900/cpu.c
@@ -60,7 +60,7 @@ static DEFINE_CLK(emc, 7);
60static DEFINE_SUBCLK(rmii, 2); 60static DEFINE_SUBCLK(rmii, 2);
61static DEFINE_CLK(usbd, 8); 61static DEFINE_CLK(usbd, 8);
62static DEFINE_CLK(usbh, 9); 62static DEFINE_CLK(usbh, 9);
63static DEFINE_CLK(g2d, 10);; 63static DEFINE_CLK(g2d, 10);
64static DEFINE_CLK(pwm, 18); 64static DEFINE_CLK(pwm, 18);
65static DEFINE_CLK(ps2, 24); 65static DEFINE_CLK(ps2, 24);
66static DEFINE_CLK(kpi, 25); 66static DEFINE_CLK(kpi, 25);
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 1278098624e6..2c09102adbaa 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -192,7 +192,7 @@ static ssize_t rbd_snap_add(struct device *dev,
192 const char *buf, 192 const char *buf,
193 size_t count); 193 size_t count);
194static void __rbd_remove_snap_dev(struct rbd_device *rbd_dev, 194static void __rbd_remove_snap_dev(struct rbd_device *rbd_dev,
195 struct rbd_snap *snap);; 195 struct rbd_snap *snap);
196 196
197 197
198static struct rbd_device *dev_to_rbd(struct device *dev) 198static struct rbd_device *dev_to_rbd(struct device *dev)
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 021d2b6b556f..9a9f9fcde378 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -48,7 +48,7 @@ static void radeon_fence_write(struct radeon_device *rdev, u32 seq)
48 scratch_index = R600_WB_EVENT_OFFSET + rdev->fence_drv.scratch_reg - rdev->scratch.reg_base; 48 scratch_index = R600_WB_EVENT_OFFSET + rdev->fence_drv.scratch_reg - rdev->scratch.reg_base;
49 else 49 else
50 scratch_index = RADEON_WB_SCRATCH_OFFSET + rdev->fence_drv.scratch_reg - rdev->scratch.reg_base; 50 scratch_index = RADEON_WB_SCRATCH_OFFSET + rdev->fence_drv.scratch_reg - rdev->scratch.reg_base;
51 rdev->wb.wb[scratch_index/4] = cpu_to_le32(seq);; 51 rdev->wb.wb[scratch_index/4] = cpu_to_le32(seq);
52 } else 52 } else
53 WREG32(rdev->fence_drv.scratch_reg, seq); 53 WREG32(rdev->fence_drv.scratch_reg, seq);
54} 54}
diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c
index b7a51c43b185..1b42b50b5992 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)
390 int tx_limit, rx_limit; 390 int tx_limit, rx_limit;
391 u32 addr = msgs[dev->msg_write_idx].addr; 391 u32 addr = msgs[dev->msg_write_idx].addr;
392 u32 buf_len = dev->tx_buf_len; 392 u32 buf_len = dev->tx_buf_len;
393 u8 *buf = dev->tx_buf;; 393 u8 *buf = dev->tx_buf;
394 394
395 intr_mask = DW_IC_INTR_DEFAULT_MASK; 395 intr_mask = DW_IC_INTR_DEFAULT_MASK;
396 396
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c
index 87010724f914..a4f07f8b2f20 100644
--- a/drivers/media/radio/wl128x/fmdrv_v4l2.c
+++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c
@@ -403,7 +403,7 @@ static int fm_v4l2_vidioc_s_hw_freq_seek(struct file *file, void *priv,
403static int fm_v4l2_vidioc_g_modulator(struct file *file, void *priv, 403static int fm_v4l2_vidioc_g_modulator(struct file *file, void *priv,
404 struct v4l2_modulator *mod) 404 struct v4l2_modulator *mod)
405{ 405{
406 struct fmdev *fmdev = video_drvdata(file);; 406 struct fmdev *fmdev = video_drvdata(file);
407 407
408 if (mod->index != 0) 408 if (mod->index != 0)
409 return -EINVAL; 409 return -EINVAL;
diff --git a/drivers/scsi/isci/phy.c b/drivers/scsi/isci/phy.c
index 79313a7a2356..8d9192d49f4a 100644
--- a/drivers/scsi/isci/phy.c
+++ b/drivers/scsi/isci/phy.c
@@ -695,7 +695,7 @@ enum sci_status sci_phy_event_handler(struct isci_phy *iphy, u32 event_code)
695 __func__, 695 __func__,
696 event_code); 696 event_code);
697 697
698 return SCI_FAILURE;; 698 return SCI_FAILURE;
699 } 699 }
700 return SCI_SUCCESS; 700 return SCI_SUCCESS;
701 case SCI_PHY_SUB_AWAIT_SATA_SPEED_EN: 701 case SCI_PHY_SUB_AWAIT_SATA_SPEED_EN:
diff --git a/drivers/staging/iio/addac/adt7316-i2c.c b/drivers/staging/iio/addac/adt7316-i2c.c
index 52d1ea349635..1c86cf11ab94 100644
--- a/drivers/staging/iio/addac/adt7316-i2c.c
+++ b/drivers/staging/iio/addac/adt7316-i2c.c
@@ -109,7 +109,7 @@ static int __devinit adt7316_i2c_probe(struct i2c_client *client,
109 109
110static int __devexit adt7316_i2c_remove(struct i2c_client *client) 110static int __devexit adt7316_i2c_remove(struct i2c_client *client)
111{ 111{
112 return adt7316_remove(&client->dev);; 112 return adt7316_remove(&client->dev);
113} 113}
114 114
115static const struct i2c_device_id adt7316_i2c_id[] = { 115static const struct i2c_device_id adt7316_i2c_id[] = {
diff --git a/drivers/staging/iio/dds/ad9832.c b/drivers/staging/iio/dds/ad9832.c
index e3e61a469bb8..6f0efe6580e7 100644
--- a/drivers/staging/iio/dds/ad9832.c
+++ b/drivers/staging/iio/dds/ad9832.c
@@ -52,7 +52,7 @@ static int ad9832_write_frequency(struct ad9832_state *st,
52 ((addr - 3) << ADD_SHIFT) | 52 ((addr - 3) << ADD_SHIFT) |
53 ((regval >> 0) & 0xFF)); 53 ((regval >> 0) & 0xFF));
54 54
55 return spi_sync(st->spi, &st->freq_msg);; 55 return spi_sync(st->spi, &st->freq_msg);
56} 56}
57 57
58static int ad9832_write_phase(struct ad9832_state *st, 58static int ad9832_write_phase(struct ad9832_state *st,
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index ce1ac2bcb314..0b3b8d0462db 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -335,7 +335,7 @@ static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
335 } else { 335 } else {
336 /* Write dQH next pointer and terminate bit to 0 */ 336 /* Write dQH next pointer and terminate bit to 0 */
337 dqh->next_dtd_ptr = req->head->td_dma 337 dqh->next_dtd_ptr = req->head->td_dma
338 & EP_QUEUE_HEAD_NEXT_POINTER_MASK;; 338 & EP_QUEUE_HEAD_NEXT_POINTER_MASK;
339 dqh->size_ioc_int_sts = 0; 339 dqh->size_ioc_int_sts = 0;
340 340
341 /* Ensure that updates to the QH will occur before priming. */ 341 /* Ensure that updates to the QH will occur before priming. */
@@ -376,7 +376,7 @@ static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
376 } 376 }
377 } 377 }
378done: 378done:
379 return retval;; 379 return retval;
380} 380}
381 381
382static struct mv_dtd *build_dtd(struct mv_req *req, unsigned *length, 382static struct mv_dtd *build_dtd(struct mv_req *req, unsigned *length,
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 9d761c95eca2..14f6a90ca217 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2931,11 +2931,11 @@ sub process {
2931 } 2931 }
2932 } 2932 }
2933 if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) { 2933 if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) {
2934 my $herectx = $here . "\n";; 2934 my $herectx = $here . "\n";
2935 my $cnt = statement_rawlines($block); 2935 my $cnt = statement_rawlines($block);
2936 2936
2937 for (my $n = 0; $n < $cnt; $n++) { 2937 for (my $n = 0; $n < $cnt; $n++) {
2938 $herectx .= raw_line($linenr, $n) . "\n";; 2938 $herectx .= raw_line($linenr, $n) . "\n";
2939 } 2939 }
2940 2940
2941 WARN("BRACES", 2941 WARN("BRACES",