Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] s/;;/;/g

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Alexey Dobriyan and committed by
Linus Torvalds
53b3531b 29afd49b

+37 -37
+3 -3
arch/arm/mach-pxa/leds-mainstone.c
··· 85 85 break; 86 86 87 87 case led_green_on: 88 - hw_led_state |= D21;; 88 + hw_led_state |= D21; 89 89 break; 90 90 91 91 case led_green_off: ··· 93 93 break; 94 94 95 95 case led_amber_on: 96 - hw_led_state |= D22;; 96 + hw_led_state |= D22; 97 97 break; 98 98 99 99 case led_amber_off: ··· 101 101 break; 102 102 103 103 case led_red_on: 104 - hw_led_state |= D23;; 104 + hw_led_state |= D23; 105 105 break; 106 106 107 107 case led_red_off:
+1 -1
arch/arm/mach-s3c2410/cpu.c
··· 146 146 board = b; 147 147 148 148 if (b->clocks_count != 0) { 149 - struct clk **ptr = b->clocks;; 149 + struct clk **ptr = b->clocks; 150 150 151 151 for (i = b->clocks_count; i > 0; i--, ptr++) 152 152 s3c24xx_register_clock(*ptr);
+1 -1
arch/frv/kernel/gdb-stub.c
··· 1406 1406 __debug_frame->psr |= PSR_S; 1407 1407 __debug_regs->brr = (__debug_frame->tbr & TBR_TT) << 12; 1408 1408 __debug_regs->brr |= BRR_EB; 1409 - sigval = SIGXCPU;; 1409 + sigval = SIGXCPU; 1410 1410 } 1411 1411 1412 1412 LEDS(0x5002);
+1 -1
arch/ia64/sn/kernel/bte.c
··· 36 36 nodepda_t *tmp_nodepda; 37 37 38 38 if (nasid_to_cnodeid(nasid) == -1) 39 - return (struct bteinfo_s *)NULL;; 39 + return (struct bteinfo_s *)NULL; 40 40 41 41 tmp_nodepda = NODEPDA(nasid_to_cnodeid(nasid)); 42 42 return &tmp_nodepda->bte_if[interface];
+1 -1
arch/ia64/sn/pci/tioca_provider.c
··· 377 377 struct tioca_dmamap *ca_dmamap; 378 378 void *map; 379 379 unsigned long flags; 380 - struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(pdev);; 380 + struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(pdev); 381 381 382 382 tioca_common = (struct tioca_common *)pcidev_info->pdi_pcibus_info; 383 383 tioca_kern = (struct tioca_kernel *)tioca_common->ca_kernel_private;
+3 -3
arch/mips/mm/dma-ip32.c
··· 138 138 BUG(); 139 139 } 140 140 141 - addr = virt_to_phys(ptr)&RAM_OFFSET_MASK;; 141 + addr = virt_to_phys(ptr)&RAM_OFFSET_MASK; 142 142 if(dev == NULL) 143 143 addr+=CRIME_HI_MEM_BASE; 144 144 return (dma_addr_t)addr; ··· 179 179 addr = (unsigned long) page_address(sg->page)+sg->offset; 180 180 if (addr) 181 181 __dma_sync(addr, sg->length, direction); 182 - addr = __pa(addr)&RAM_OFFSET_MASK;; 182 + addr = __pa(addr)&RAM_OFFSET_MASK; 183 183 if(dev == NULL) 184 184 addr += CRIME_HI_MEM_BASE; 185 185 sg->dma_address = (dma_addr_t)addr; ··· 199 199 200 200 addr = (unsigned long) page_address(page) + offset; 201 201 dma_cache_wback_inv(addr, size); 202 - addr = __pa(addr)&RAM_OFFSET_MASK;; 202 + addr = __pa(addr)&RAM_OFFSET_MASK; 203 203 if(dev == NULL) 204 204 addr += CRIME_HI_MEM_BASE; 205 205
+1 -1
arch/ppc/syslib/ppc85xx_setup.c
··· 235 235 (__ilog2(MPC85XX_PCI2_UPPER_MEM - MPC85XX_PCI2_LOWER_MEM + 1) - 1); 236 236 237 237 /* 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; 239 239 pci->potear2 = 0x00000000; 240 240 pci->powbar2 = (MPC85XX_PCI2_IO_BASE >> 12) & 0x000fffff; 241 241 /* Enable, IO R/W */
+1 -1
arch/sparc64/kernel/irq.c
··· 727 727 } 728 728 729 729 #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 *); 731 731 732 732 /* XXX No easy way to include asm/floppy.h XXX */ 733 733 extern unsigned char *pdma_vaddr;
+1 -1
drivers/char/synclink.c
··· 7770 7770 } 7771 7771 7772 7772 info->params.encoding = new_encoding; 7773 - info->params.crc_type = new_crctype;; 7773 + info->params.crc_type = new_crctype; 7774 7774 7775 7775 /* if network interface up, reprogram hardware */ 7776 7776 if (info->netcount)
+1 -1
drivers/char/synclinkmp.c
··· 1650 1650 } 1651 1651 1652 1652 info->params.encoding = new_encoding; 1653 - info->params.crc_type = new_crctype;; 1653 + info->params.crc_type = new_crctype; 1654 1654 1655 1655 /* if network interface up, reprogram hardware */ 1656 1656 if (info->netcount)
+1 -1
drivers/hwmon/gl520sm.c
··· 456 456 long v = simple_strtol(buf, NULL, 10); 457 457 458 458 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); 460 460 gl520_write_value(client, reg, data->temp_max[n - 1]); 461 461 mutex_unlock(&data->update_lock); 462 462 return count;
+1 -1
drivers/i2c/chips/rtc8564.c
··· 53 53 #define CTRL1(c) _rtc8564_ctrl1(c) 54 54 #define CTRL2(c) _rtc8564_ctrl2(c) 55 55 56 - static int debug;; 56 + static int debug; 57 57 module_param(debug, int, S_IRUGO | S_IWUSR); 58 58 59 59 static struct i2c_driver rtc8564_driver;
+1 -1
drivers/ide/ide-dma.c
··· 175 175 if (rq->rq_disk) { 176 176 ide_driver_t *drv; 177 177 178 - drv = *(ide_driver_t **)rq->rq_disk->private_data;; 178 + drv = *(ide_driver_t **)rq->rq_disk->private_data; 179 179 drv->end_request(drive, 1, rq->nr_sectors); 180 180 } else 181 181 ide_end_request(drive, 1, rq->nr_sectors);
+1 -1
drivers/net/sk98lin/skge.c
··· 1727 1727 pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32); 1728 1728 pTxd->pMBuf = pMessage; 1729 1729 1730 - pTxd->TBControl = Control | BMU_OWN | sk_frag->size;; 1730 + pTxd->TBControl = Control | BMU_OWN | sk_frag->size; 1731 1731 1732 1732 /* 1733 1733 ** Do we have the last fragment?
+1 -1
drivers/net/sky2.h
··· 1804 1804 __le16 length; 1805 1805 u8 ctrl; 1806 1806 u8 opcode; 1807 - } __attribute((packed));; 1807 + } __attribute((packed)); 1808 1808 1809 1809 struct sky2_status_le { 1810 1810 __le32 status; /* also checksum */
+2 -2
drivers/net/wireless/prism54/oid_mgt.c
··· 332 332 case OID_TYPE_ATTACH:{ 333 333 struct obj_attachment *attach = data; 334 334 attach->id = le16_to_cpu(attach->id); 335 - attach->size = le16_to_cpu(attach->size);; 335 + attach->size = le16_to_cpu(attach->size); 336 336 break; 337 337 } 338 338 case OID_TYPE_SSID: ··· 401 401 case OID_TYPE_ATTACH:{ 402 402 struct obj_attachment *attach = data; 403 403 attach->id = cpu_to_le16(attach->id); 404 - attach->size = cpu_to_le16(attach->size);; 404 + attach->size = cpu_to_le16(attach->size); 405 405 break; 406 406 } 407 407 case OID_TYPE_SSID:
+1 -1
drivers/net/wireless/spectrum_cs.c
··· 147 147 __le16 _len; /* length of ID and data, in words */ 148 148 __le16 _id; /* record ID */ 149 149 char data[0]; /* plug data */ 150 - } __attribute__ ((packed));; 150 + } __attribute__ ((packed)); 151 151 152 152 153 153 /* Functions for access to little-endian data */
+1 -1
drivers/scsi/megaraid/megaraid_mbox.c
··· 2797 2797 // available within 1 second, assume FW is initializing and wait 2798 2798 // for an extended amount of time 2799 2799 if (mbox->numstatus == 0xFF) { // status not yet available 2800 - udelay(25);; 2800 + udelay(25); 2801 2801 2802 2802 for (i = 0; mbox->numstatus == 0xFF && i < 1000; i++) { 2803 2803 rmb();
+1 -1
drivers/usb/image/microtek.c
··· 360 360 rc = usb_lock_device_for_reset(desc->usb_dev, desc->usb_intf); 361 361 if (rc < 0) 362 362 return FAILED; 363 - result = usb_reset_device(desc->usb_dev);; 363 + result = usb_reset_device(desc->usb_dev); 364 364 if (rc) 365 365 usb_unlock_device(desc->usb_dev); 366 366 return result ? FAILED : SUCCESS;
+1 -1
drivers/usb/input/hid-core.c
··· 1215 1215 1216 1216 if (hid->outhead != hid->outtail) { 1217 1217 if (hid_submit_out(hid)) { 1218 - clear_bit(HID_OUT_RUNNING, &hid->iofl);; 1218 + clear_bit(HID_OUT_RUNNING, &hid->iofl); 1219 1219 wake_up(&hid->wait); 1220 1220 } 1221 1221 spin_unlock_irqrestore(&hid->outlock, flags);
+1 -1
drivers/video/aty/radeon_pm.c
··· 2080 2080 OUTREG(0x2ec, 0x6332a3f0); 2081 2081 mdelay(17); 2082 2082 2083 - OUTPLL(pllPPLL_REF_DIV, rinfo->pll.ref_div);; 2083 + OUTPLL(pllPPLL_REF_DIV, rinfo->pll.ref_div); 2084 2084 OUTPLL(pllPPLL_DIV_0, rinfo->save_regs[92]); 2085 2085 2086 2086 mdelay(40);
+1 -1
fs/cifs/cifssmb.c
··· 4908 4908 parm_data->list_len = cpu_to_le32(count); 4909 4909 parm_data->list[0].EA_flags = 0; 4910 4910 /* 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; 4912 4912 /* EA names are always ASCII */ 4913 4913 if(ea_name) 4914 4914 strncpy(parm_data->list[0].name,ea_name,name_len);
+1 -1
fs/pnode.c
··· 130 130 { 131 131 struct vfsmount *p_last_src = NULL; 132 132 struct vfsmount *p_last_dest = NULL; 133 - *type = CL_PROPAGATION;; 133 + *type = CL_PROPAGATION; 134 134 135 135 if (IS_MNT_SHARED(dest)) 136 136 *type |= CL_MAKE_SHARED;
+1 -1
include/acpi/acpi_bus.h
··· 269 269 270 270 struct acpi_device_wakeup { 271 271 acpi_handle gpe_device; 272 - acpi_integer gpe_number;; 272 + acpi_integer gpe_number; 273 273 acpi_integer sleep_state; 274 274 struct acpi_handle_list resources; 275 275 struct acpi_device_wakeup_state state;
+1 -1
include/asm-ia64/sn/sn_sal.h
··· 1037 1037 1038 1038 /***** BEGIN HACK - temp til old proms no longer supported ********/ 1039 1039 if (ret_stuff.status == SALRET_NOT_IMPLEMENTED) { 1040 - int nasid = get_sapicid() & 0xfff;; 1040 + int nasid = get_sapicid() & 0xfff; 1041 1041 #define SH_SHUB_ID_NODES_PER_BIT_MASK 0x001f000000000000UL 1042 1042 #define SH_SHUB_ID_NODES_PER_BIT_SHFT 48 1043 1043 if (shubtype) *shubtype = 0;
+1 -1
net/ipv4/inet_hashtables.c
··· 315 315 spin_unlock(&head->lock); 316 316 317 317 if (tw) { 318 - inet_twsk_deschedule(tw, death_row);; 318 + inet_twsk_deschedule(tw, death_row); 319 319 inet_twsk_put(tw); 320 320 } 321 321
+1 -1
net/ipv4/netfilter/ip_nat_standalone.c
··· 394 394 ret = nf_register_hook(&ip_nat_local_out_ops); 395 395 if (ret < 0) { 396 396 printk("ip_nat_init: can't register local out hook.\n"); 397 - goto cleanup_adjustout_ops;; 397 + goto cleanup_adjustout_ops; 398 398 } 399 399 ret = nf_register_hook(&ip_nat_local_in_ops); 400 400 if (ret < 0) {
+1 -1
net/tipc/link.c
··· 1629 1629 tipc_msg_print(TIPC_CONS, buf_msg(buf), ">RETR>"); 1630 1630 info("...Retransmitted %u times\n", 1631 1631 l_ptr->stale_count); 1632 - link_print(l_ptr, TIPC_CONS, "Resetting Link\n");; 1632 + link_print(l_ptr, TIPC_CONS, "Resetting Link\n"); 1633 1633 tipc_link_reset(l_ptr); 1634 1634 break; 1635 1635 }
+2 -2
sound/ppc/toonie.c
··· 117 117 gp = &mix->amp_mute_gpio; 118 118 break; 119 119 default: 120 - return -EINVAL;; 120 + return -EINVAL; 121 121 } 122 122 ucontrol->value.integer.value[0] = !check_audio_gpio(gp); 123 123 return 0; ··· 145 145 gp = &mix->amp_mute_gpio; 146 146 break; 147 147 default: 148 - return -EINVAL;; 148 + return -EINVAL; 149 149 } 150 150 val = ! check_audio_gpio(gp); 151 151 if (val != ucontrol->value.integer.value[0]) {