History

[PATCH] s/;;/;/g

Alexey Dobriyan committed 20 years ago

Commit 53b35311 parent 29afd4931 files · +37 −37Browse files

Unified · Split

31 files
  1. arch/arm/mach-pxa/leds-mainstone.c +3 −3
  2. arch/arm/mach-s3c2410/cpu.c +1 −1
  3. arch/frv/kernel/gdb-stub.c +1 −1
  4. arch/ia64/sn/kernel/bte.c +1 −1
  5. arch/ia64/sn/pci/tioca_provider.c +1 −1
  6. arch/mips/mm/dma-ip32.c +3 −3
  7. arch/ppc/syslib/ppc85xx_setup.c +1 −1
  8. arch/sparc64/kernel/irq.c +1 −1
  9. drivers/char/pcmcia/synclink_cs.c +1 −1
  10. drivers/char/synclink.c +1 −1
  11. drivers/char/synclink_gt.c +1 −1
  12. drivers/char/synclinkmp.c +1 −1
  13. drivers/hwmon/gl520sm.c +1 −1
  14. drivers/i2c/chips/rtc8564.c +1 −1
  15. drivers/ide/ide-dma.c +1 −1
  16. drivers/net/sk98lin/skge.c +1 −1
  17. drivers/net/sky2.h +1 −1
  18. drivers/net/wireless/prism54/oid_mgt.c +2 −2
  19. drivers/net/wireless/spectrum_cs.c +1 −1
  20. drivers/scsi/megaraid/megaraid_mbox.c +1 −1
  21. drivers/usb/image/microtek.c +1 −1
  22. drivers/usb/input/hid-core.c +1 −1
  23. drivers/video/aty/radeon_pm.c +1 −1
  24. fs/cifs/cifssmb.c +1 −1
  25. fs/pnode.c +1 −1
  26. include/acpi/acpi_bus.h +1 −1
  27. include/asm-ia64/sn/sn_sal.h +1 −1
  28. net/ipv4/inet_hashtables.c +1 −1
  29. net/ipv4/netfilter/ip_nat_standalone.c +1 −1
  30. net/tipc/link.c +1 −1
  31. sound/ppc/toonie.c +2 −2
arch/arm/mach-pxa/leds-mainstone.c+3−3
@@ -85,7 +85,7 @@ void mainstone_leds_event(led_event_t evt) · 84 unmodified lines
8585 break;
8686
8787 case led_green_on:
88− hw_led_state |= D21;;
88+ hw_led_state |= D21;
8989 break;
9090
9191 case led_green_off:
@@ -93,7 +93,7 @@ void mainstone_leds_event(led_event_t evt) · 1 unmodified line
9393 break;
9494
9595 case led_amber_on:
96− hw_led_state |= D22;;
96+ hw_led_state |= D22;
9797 break;
9898
9999 case led_amber_off:
@@ -101,7 +101,7 @@ void mainstone_leds_event(led_event_t evt) · 1 unmodified line
101101 break;
102102
103103 case led_red_on:
104− hw_led_state |= D23;;
104+ hw_led_state |= D23;
105105 break;
106106
107107 case led_red_off:
arch/arm/mach-s3c2410/cpu.c+1−1
@@ -146,7 +146,7 @@ void s3c24xx_set_board(struct s3c24xx_board *b) · 145 unmodified lines
146146 board = b;
147147
148148 if (b->clocks_count != 0) {
149− struct clk **ptr = b->clocks;;
149+ struct clk **ptr = b->clocks;
150150
151151 for (i = b->clocks_count; i > 0; i--, ptr++)
152152 s3c24xx_register_clock(*ptr);
arch/frv/kernel/gdb-stub.c+1−1
@@ -1406,7 +1406,7 @@ void gdbstub(int sigval) · 1405 unmodified lines
14061406 __debug_frame->psr |= PSR_S;
14071407 __debug_regs->brr = (__debug_frame->tbr & TBR_TT) << 12;
14081408 __debug_regs->brr |= BRR_EB;
1409− sigval = SIGXCPU;;
1409+ sigval = SIGXCPU;
14101410 }
14111411
14121412 LEDS(0x5002);
arch/ia64/sn/kernel/bte.c+1−1
@@ -36,7 +36,7 @@ static struct bteinfo_s *bte_if_on_node(nasid_t nasid, int interface) · 35 unmodified lines
3636 nodepda_t *tmp_nodepda;
3737
3838 if (nasid_to_cnodeid(nasid) == -1)
39− return (struct bteinfo_s *)NULL;;
39+ return (struct bteinfo_s *)NULL;
4040
4141 tmp_nodepda = NODEPDA(nasid_to_cnodeid(nasid));
4242 return &tmp_nodepda->bte_if[interface];
arch/ia64/sn/pci/tioca_provider.c+1−1
@@ -377,7 +377,7 @@ tioca_dma_mapped(struct pci_dev *pdev, u64 paddr, size_t req_size) · 376 unmodified lines
377377 struct tioca_dmamap *ca_dmamap;
378378 void *map;
379379 unsigned long flags;
380− struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(pdev);;
380+ struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(pdev);
381381
382382 tioca_common = (struct tioca_common *)pcidev_info->pdi_pcibus_info;
383383 tioca_kern = (struct tioca_kernel *)tioca_common->ca_kernel_private;
arch/mips/mm/dma-ip32.c+3−3
@@ -138,7 +138,7 @@ dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, · 137 unmodified lines
138138 BUG();
139139 }
140140
141− addr = virt_to_phys(ptr)&RAM_OFFSET_MASK;;
141+ addr = virt_to_phys(ptr)&RAM_OFFSET_MASK;
142142 if(dev == NULL)
143143 addr+=CRIME_HI_MEM_BASE;
144144 return (dma_addr_t)addr;
@@ -179,7 +179,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, · 34 unmodified lines
179179 addr = (unsigned long) page_address(sg->page)+sg->offset;
180180 if (addr)
181181 __dma_sync(addr, sg->length, direction);
182− addr = __pa(addr)&RAM_OFFSET_MASK;;
182+ addr = __pa(addr)&RAM_OFFSET_MASK;
183183 if(dev == NULL)
184184 addr += CRIME_HI_MEM_BASE;
185185 sg->dma_address = (dma_addr_t)addr;
@@ -199,7 +199,7 @@ dma_addr_t dma_map_page(struct device *dev, struct page *page, · 13 unmodified lines
199199
200200 addr = (unsigned long) page_address(page) + offset;
201201 dma_cache_wback_inv(addr, size);
202− addr = __pa(addr)&RAM_OFFSET_MASK;;
202+ addr = __pa(addr)&RAM_OFFSET_MASK;
203203 if(dev == NULL)
204204 addr += CRIME_HI_MEM_BASE;
205205
arch/ppc/syslib/ppc85xx_setup.c+1−1
@@ -235,7 +235,7 @@ mpc85xx_setup_pci2(struct pci_controller *hose) · 234 unmodified lines
235235 (__ilog2(MPC85XX_PCI2_UPPER_MEM - MPC85XX_PCI2_LOWER_MEM + 1) - 1);
236236
237237 /* Setup outbound IO windows @ MPC85XX_PCI2_IO_BASE */
238− pci->potar2 = (MPC85XX_PCI2_LOWER_IO >> 12) & 0x000fffff;;
238+ pci->potar2 = (MPC85XX_PCI2_LOWER_IO >> 12) & 0x000fffff;
239239 pci->potear2 = 0x00000000;
240240 pci->powbar2 = (MPC85XX_PCI2_IO_BASE >> 12) & 0x000fffff;
241241 /* Enable, IO R/W */
arch/sparc64/kernel/irq.c+1−1
@@ -727,7 +727,7 @@ void handler_irq(int irq, struct pt_regs *regs) · 726 unmodified lines
727727 }
728728
729729 #ifdef CONFIG_BLK_DEV_FD
730−extern irqreturn_t floppy_interrupt(int, void *, struct pt_regs *);;
730+extern irqreturn_t floppy_interrupt(int, void *, struct pt_regs *);
731731
732732 /* XXX No easy way to include asm/floppy.h XXX */
733733 extern unsigned char *pdma_vaddr;
drivers/char/pcmcia/synclink_cs.c+1−1
@@ -4181,7 +4181,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, · 4180 unmodified lines
41814181 }
41824182
41834183 info->params.encoding = new_encoding;
4184− info->params.crc_type = new_crctype;;
4184+ info->params.crc_type = new_crctype;
41854185
41864186 /* if network interface up, reprogram hardware */
41874187 if (info->netcount)
drivers/char/synclink.c+1−1
@@ -7770,7 +7770,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, · 7769 unmodified lines
77707770 }
77717771
77727772 info->params.encoding = new_encoding;
7773− info->params.crc_type = new_crctype;;
7773+ info->params.crc_type = new_crctype;
77747774
77757775 /* if network interface up, reprogram hardware */
77767776 if (info->netcount)
drivers/char/synclink_gt.c+1−1
@@ -1365,7 +1365,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, · 1364 unmodified lines
13651365 }
13661366
13671367 info->params.encoding = new_encoding;
1368− info->params.crc_type = new_crctype;;
1368+ info->params.crc_type = new_crctype;
13691369
13701370 /* if network interface up, reprogram hardware */
13711371 if (info->netcount)
drivers/char/synclinkmp.c+1−1
@@ -1650,7 +1650,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding, · 1649 unmodified lines
16501650 }
16511651
16521652 info->params.encoding = new_encoding;
1653− info->params.crc_type = new_crctype;;
1653+ info->params.crc_type = new_crctype;
16541654
16551655 /* if network interface up, reprogram hardware */
16561656 if (info->netcount)
drivers/hwmon/gl520sm.c+1−1
@@ -456,7 +456,7 @@ static ssize_t set_temp_max(struct i2c_client *client, struct gl520_data *data, · 455 unmodified lines
456456 long v = simple_strtol(buf, NULL, 10);
457457
458458 mutex_lock(&data->update_lock);
459− data->temp_max[n - 1] = TEMP_TO_REG(v);;
459+ data->temp_max[n - 1] = TEMP_TO_REG(v);
460460 gl520_write_value(client, reg, data->temp_max[n - 1]);
461461 mutex_unlock(&data->update_lock);
462462 return count;
drivers/i2c/chips/rtc8564.c+1−1
@@ -53,7 +53,7 @@ static inline u8 _rtc8564_ctrl2(struct i2c_client *client) · 52 unmodified lines
5353 #define CTRL1(c) _rtc8564_ctrl1(c)
5454 #define CTRL2(c) _rtc8564_ctrl2(c)
5555
56−static int debug;;
56+static int debug;
5757 module_param(debug, int, S_IRUGO | S_IWUSR);
5858
5959 static struct i2c_driver rtc8564_driver;
drivers/ide/ide-dma.c+1−1
@@ -175,7 +175,7 @@ ide_startstop_t ide_dma_intr (ide_drive_t *drive) · 174 unmodified lines
175175 if (rq->rq_disk) {
176176 ide_driver_t *drv;
177177
178− drv = *(ide_driver_t **)rq->rq_disk->private_data;;
178+ drv = *(ide_driver_t **)rq->rq_disk->private_data;
179179 drv->end_request(drive, 1, rq->nr_sectors);
180180 } else
181181 ide_end_request(drive, 1, rq->nr_sectors);
drivers/net/sk98lin/skge.c+1−1
@@ -1727,7 +1727,7 @@ struct sk_buff *pMessage) /* pointer to send-message */ · 1726 unmodified lines
17271727 pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32);
17281728 pTxd->pMBuf = pMessage;
17291729
1730− pTxd->TBControl = Control | BMU_OWN | sk_frag->size;;
1730+ pTxd->TBControl = Control | BMU_OWN | sk_frag->size;
17311731
17321732 /*
17331733 ** Do we have the last fragment?
drivers/net/sky2.h+1−1
@@ -1804,7 +1804,7 @@ struct sky2_rx_le { · 1803 unmodified lines
18041804 __le16 length;
18051805 u8 ctrl;
18061806 u8 opcode;
1807−} __attribute((packed));;
1807+} __attribute((packed));
18081808
18091809 struct sky2_status_le {
18101810 __le32 status; /* also checksum */
drivers/net/wireless/prism54/oid_mgt.c+2−2
@@ -332,7 +332,7 @@ mgt_le_to_cpu(int type, void *data) · 331 unmodified lines
332332 case OID_TYPE_ATTACH:{
333333 struct obj_attachment *attach = data;
334334 attach->id = le16_to_cpu(attach->id);
335− attach->size = le16_to_cpu(attach->size);;
335+ attach->size = le16_to_cpu(attach->size);
336336 break;
337337 }
338338 case OID_TYPE_SSID:
@@ -401,7 +401,7 @@ mgt_cpu_to_le(int type, void *data) · 62 unmodified lines
401401 case OID_TYPE_ATTACH:{
402402 struct obj_attachment *attach = data;
403403 attach->id = cpu_to_le16(attach->id);
404− attach->size = cpu_to_le16(attach->size);;
404+ attach->size = cpu_to_le16(attach->size);
405405 break;
406406 }
407407 case OID_TYPE_SSID:
drivers/net/wireless/spectrum_cs.c+1−1
@@ -147,7 +147,7 @@ struct pdi { · 146 unmodified lines
147147 __le16 _len; /* length of ID and data, in words */
148148 __le16 _id; /* record ID */
149149 char data[0]; /* plug data */
150−} __attribute__ ((packed));;
150+} __attribute__ ((packed));
151151
152152
153153 /* Functions for access to little-endian data */
drivers/scsi/megaraid/megaraid_mbox.c+1−1
@@ -2797,7 +2797,7 @@ mbox_post_sync_cmd(adapter_t *adapter, uint8_t raw_mbox[]) · 2796 unmodified lines
27972797 // available within 1 second, assume FW is initializing and wait
27982798 // for an extended amount of time
27992799 if (mbox->numstatus == 0xFF) { // status not yet available
2800− udelay(25);;
2800+ udelay(25);
28012801
28022802 for (i = 0; mbox->numstatus == 0xFF && i < 1000; i++) {
28032803 rmb();
drivers/usb/image/microtek.c+1−1
@@ -360,7 +360,7 @@ static int mts_scsi_host_reset (Scsi_Cmnd *srb) · 359 unmodified lines
360360 rc = usb_lock_device_for_reset(desc->usb_dev, desc->usb_intf);
361361 if (rc < 0)
362362 return FAILED;
363− result = usb_reset_device(desc->usb_dev);;
363+ result = usb_reset_device(desc->usb_dev);
364364 if (rc)
365365 usb_unlock_device(desc->usb_dev);
366366 return result ? FAILED : SUCCESS;
drivers/usb/input/hid-core.c+1−1
@@ -1215,7 +1215,7 @@ static void hid_irq_out(struct urb *urb, struct pt_regs *regs) · 1214 unmodified lines
12151215
12161216 if (hid->outhead != hid->outtail) {
12171217 if (hid_submit_out(hid)) {
1218− clear_bit(HID_OUT_RUNNING, &hid->iofl);;
1218+ clear_bit(HID_OUT_RUNNING, &hid->iofl);
12191219 wake_up(&hid->wait);
12201220 }
12211221 spin_unlock_irqrestore(&hid->outlock, flags);
drivers/video/aty/radeon_pm.c+1−1
@@ -2080,7 +2080,7 @@ static void radeon_reinitialize_M9P(struct radeonfb_info *rinfo) · 2079 unmodified lines
20802080 OUTREG(0x2ec, 0x6332a3f0);
20812081 mdelay(17);
20822082
2083− OUTPLL(pllPPLL_REF_DIV, rinfo->pll.ref_div);;
2083+ OUTPLL(pllPPLL_REF_DIV, rinfo->pll.ref_div);
20842084 OUTPLL(pllPPLL_DIV_0, rinfo->save_regs[92]);
20852085
20862086 mdelay(40);
fs/cifs/cifssmb.c+1−1
@@ -4908,7 +4908,7 @@ SetEARetry: · 4907 unmodified lines
49084908 parm_data->list_len = cpu_to_le32(count);
49094909 parm_data->list[0].EA_flags = 0;
49104910 /* we checked above that name len is less than 255 */
4911− parm_data->list[0].name_len = (__u8)name_len;;
4911+ parm_data->list[0].name_len = (__u8)name_len;
49124912 /* EA names are always ASCII */
49134913 if(ea_name)
49144914 strncpy(parm_data->list[0].name,ea_name,name_len);
fs/pnode.c+1−1
@@ -130,7 +130,7 @@ static struct vfsmount *get_source(struct vfsmount *dest, · 129 unmodified lines
130130 {
131131 struct vfsmount *p_last_src = NULL;
132132 struct vfsmount *p_last_dest = NULL;
133− *type = CL_PROPAGATION;;
133+ *type = CL_PROPAGATION;
134134
135135 if (IS_MNT_SHARED(dest))
136136 *type |= CL_MAKE_SHARED;
include/acpi/acpi_bus.h+1−1
@@ -269,7 +269,7 @@ struct acpi_device_wakeup_state { · 268 unmodified lines
269269
270270 struct acpi_device_wakeup {
271271 acpi_handle gpe_device;
272− acpi_integer gpe_number;;
272+ acpi_integer gpe_number;
273273 acpi_integer sleep_state;
274274 struct acpi_handle_list resources;
275275 struct acpi_device_wakeup_state state;
include/asm-ia64/sn/sn_sal.h+1−1
@@ -1037,7 +1037,7 @@ ia64_sn_get_sn_info(int fc, u8 *shubtype, u16 *nasid_bitmask, u8 *nasid_shift, · 1036 unmodified lines
10371037
10381038 /***** BEGIN HACK - temp til old proms no longer supported ********/
10391039 if (ret_stuff.status == SALRET_NOT_IMPLEMENTED) {
1040− int nasid = get_sapicid() & 0xfff;;
1040+ int nasid = get_sapicid() & 0xfff;
10411041 #define SH_SHUB_ID_NODES_PER_BIT_MASK 0x001f000000000000UL
10421042 #define SH_SHUB_ID_NODES_PER_BIT_SHFT 48
10431043 if (shubtype) *shubtype = 0;
net/ipv4/inet_hashtables.c+1−1
@@ -315,7 +315,7 @@ ok: · 314 unmodified lines
315315 spin_unlock(&head->lock);
316316
317317 if (tw) {
318− inet_twsk_deschedule(tw, death_row);;
318+ inet_twsk_deschedule(tw, death_row);
319319 inet_twsk_put(tw);
320320 }
321321
net/ipv4/netfilter/ip_nat_standalone.c+1−1
@@ -394,7 +394,7 @@ static int init_or_cleanup(int init) · 393 unmodified lines
394394 ret = nf_register_hook(&ip_nat_local_out_ops);
395395 if (ret < 0) {
396396 printk("ip_nat_init: can't register local out hook.\n");
397− goto cleanup_adjustout_ops;;
397+ goto cleanup_adjustout_ops;
398398 }
399399 ret = nf_register_hook(&ip_nat_local_in_ops);
400400 if (ret < 0) {
net/tipc/link.c+1−1
@@ -1629,7 +1629,7 @@ void tipc_link_retransmit(struct link *l_ptr, struct sk_buff *buf, · 1628 unmodified lines
16291629 tipc_msg_print(TIPC_CONS, buf_msg(buf), ">RETR>");
16301630 info("...Retransmitted %u times\n",
16311631 l_ptr->stale_count);
1632− link_print(l_ptr, TIPC_CONS, "Resetting Link\n");;
1632+ link_print(l_ptr, TIPC_CONS, "Resetting Link\n");
16331633 tipc_link_reset(l_ptr);
16341634 break;
16351635 }
sound/ppc/toonie.c+2−2
@@ -117,7 +117,7 @@ static int toonie_get_mute_switch(struct snd_kcontrol *kcontrol, · 116 unmodified lines
117117 gp = &mix->amp_mute_gpio;
118118 break;
119119 default:
120− return -EINVAL;;
120+ return -EINVAL;
121121 }
122122 ucontrol->value.integer.value[0] = !check_audio_gpio(gp);
123123 return 0;
@@ -145,7 +145,7 @@ static int toonie_put_mute_switch(struct snd_kcontrol *kcontrol, · 21 unmodified lines
145145 gp = &mix->amp_mute_gpio;
146146 break;
147147 default:
148− return -EINVAL;;
148+ return -EINVAL;
149149 }
150150 val = ! check_audio_gpio(gp);
151151 if (val != ucontrol->value.integer.value[0]) {