openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Alexey Dobriyan 2006-03-24 03:16:13 -08:00 committed by Linus Torvalds
parent 29afd49b72
commit 53b3531bbb
31 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-pxa/leds-mainstone.c
View File

@ -85,7 +85,7 @@ void mainstone_leds_event(led_event_t evt)
break;
case led_green_on:
hw_led_state |= D21;;
hw_led_state |= D21;
break;
case led_green_off:
@ -93,7 +93,7 @@ void mainstone_leds_event(led_event_t evt)
break;
case led_amber_on:
hw_led_state |= D22;;
hw_led_state |= D22;
break;
case led_amber_off:
@ -101,7 +101,7 @@ void mainstone_leds_event(led_event_t evt)
break;
case led_red_on:
hw_led_state |= D23;;
hw_led_state |= D23;
break;
case led_red_off:

2
arch/arm/mach-s3c2410/cpu.c
View File

@ -146,7 +146,7 @@ void s3c24xx_set_board(struct s3c24xx_board *b)
board = b;
if (b->clocks_count != 0) {
struct clk **ptr = b->clocks;;
struct clk **ptr = b->clocks;
for (i = b->clocks_count; i > 0; i--, ptr++)
s3c24xx_register_clock(*ptr);

2
arch/frv/kernel/gdb-stub.c
View File

@ -1406,7 +1406,7 @@ void gdbstub(int sigval)
__debug_frame->psr |= PSR_S;
__debug_regs->brr = (__debug_frame->tbr & TBR_TT) << 12;
__debug_regs->brr |= BRR_EB;
sigval = SIGXCPU;;
sigval = SIGXCPU;
}
LEDS(0x5002);

2
arch/ia64/sn/kernel/bte.c
View File

@ -36,7 +36,7 @@ static struct bteinfo_s *bte_if_on_node(nasid_t nasid, int interface)
nodepda_t *tmp_nodepda;
if (nasid_to_cnodeid(nasid) == -1)
return (struct bteinfo_s *)NULL;;
return (struct bteinfo_s *)NULL;
tmp_nodepda = NODEPDA(nasid_to_cnodeid(nasid));
return &tmp_nodepda->bte_if[interface];

2
arch/ia64/sn/pci/tioca_provider.c
View File

@ -377,7 +377,7 @@ tioca_dma_mapped(struct pci_dev *pdev, u64 paddr, size_t req_size)
struct tioca_dmamap *ca_dmamap;
void *map;
unsigned long flags;
struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(pdev);;
struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(pdev);
tioca_common = (struct tioca_common *)pcidev_info->pdi_pcibus_info;
tioca_kern = (struct tioca_kernel *)tioca_common->ca_kernel_private;

6
arch/mips/mm/dma-ip32.c
View File

@ -138,7 +138,7 @@ dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
BUG();
}
addr = virt_to_phys(ptr)&RAM_OFFSET_MASK;;
addr = virt_to_phys(ptr)&RAM_OFFSET_MASK;
if(dev == NULL)
addr+=CRIME_HI_MEM_BASE;
return (dma_addr_t)addr;
@ -179,7 +179,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
addr = (unsigned long) page_address(sg->page)+sg->offset;
if (addr)
__dma_sync(addr, sg->length, direction);
addr = __pa(addr)&RAM_OFFSET_MASK;;
addr = __pa(addr)&RAM_OFFSET_MASK;
if(dev == NULL)
addr += CRIME_HI_MEM_BASE;
sg->dma_address = (dma_addr_t)addr;
@ -199,7 +199,7 @@ dma_addr_t dma_map_page(struct device *dev, struct page *page,
addr = (unsigned long) page_address(page) + offset;
dma_cache_wback_inv(addr, size);
addr = __pa(addr)&RAM_OFFSET_MASK;;
addr = __pa(addr)&RAM_OFFSET_MASK;
if(dev == NULL)
addr += CRIME_HI_MEM_BASE;

2
arch/ppc/syslib/ppc85xx_setup.c
View File

@ -235,7 +235,7 @@ mpc85xx_setup_pci2(struct pci_controller *hose)
(__ilog2(MPC85XX_PCI2_UPPER_MEM - MPC85XX_PCI2_LOWER_MEM + 1) - 1);
/* Setup outbound IO windows @ MPC85XX_PCI2_IO_BASE */
pci->potar2 = (MPC85XX_PCI2_LOWER_IO >> 12) & 0x000fffff;;
pci->potar2 = (MPC85XX_PCI2_LOWER_IO >> 12) & 0x000fffff;
pci->potear2 = 0x00000000;
pci->powbar2 = (MPC85XX_PCI2_IO_BASE >> 12) & 0x000fffff;
/* Enable, IO R/W */

2
arch/sparc64/kernel/irq.c
View File

@ -727,7 +727,7 @@ void handler_irq(int irq, struct pt_regs *regs)
}
#ifdef CONFIG_BLK_DEV_FD
extern irqreturn_t floppy_interrupt(int, void *, struct pt_regs *);;
extern irqreturn_t floppy_interrupt(int, void *, struct pt_regs *);
/* XXX No easy way to include asm/floppy.h XXX */
extern unsigned char *pdma_vaddr;

2
drivers/char/pcmcia/synclink_cs.c
View File

@ -4181,7 +4181,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
}
info->params.encoding = new_encoding;
info->params.crc_type = new_crctype;;
info->params.crc_type = new_crctype;
/* if network interface up, reprogram hardware */
if (info->netcount)

2
drivers/char/synclink.c
View File

@ -7770,7 +7770,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
}
info->params.encoding = new_encoding;
info->params.crc_type = new_crctype;;
info->params.crc_type = new_crctype;
/* if network interface up, reprogram hardware */
if (info->netcount)

2
drivers/char/synclink_gt.c
View File

@ -1365,7 +1365,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
}
info->params.encoding = new_encoding;
info->params.crc_type = new_crctype;;
info->params.crc_type = new_crctype;
/* if network interface up, reprogram hardware */
if (info->netcount)

2
drivers/char/synclinkmp.c
View File

@ -1650,7 +1650,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
}
info->params.encoding = new_encoding;
info->params.crc_type = new_crctype;;
info->params.crc_type = new_crctype;
/* if network interface up, reprogram hardware */
if (info->netcount)

2
drivers/hwmon/gl520sm.c
View File

@ -456,7 +456,7 @@ static ssize_t set_temp_max(struct i2c_client *client, struct gl520_data *data,
long v = simple_strtol(buf, NULL, 10);
mutex_lock(&data->update_lock);
data->temp_max[n - 1] = TEMP_TO_REG(v);;
data->temp_max[n - 1] = TEMP_TO_REG(v);
gl520_write_value(client, reg, data->temp_max[n - 1]);
mutex_unlock(&data->update_lock);
return count;

2
drivers/i2c/chips/rtc8564.c
View File

@ -53,7 +53,7 @@ static inline u8 _rtc8564_ctrl2(struct i2c_client *client)
#define CTRL1(c) _rtc8564_ctrl1(c)
#define CTRL2(c) _rtc8564_ctrl2(c)
static int debug;;
static int debug;
module_param(debug, int, S_IRUGO | S_IWUSR);
static struct i2c_driver rtc8564_driver;

2
drivers/ide/ide-dma.c
View File

@ -175,7 +175,7 @@ ide_startstop_t ide_dma_intr (ide_drive_t *drive)
if (rq->rq_disk) {
ide_driver_t *drv;
drv = *(ide_driver_t **)rq->rq_disk->private_data;;
drv = *(ide_driver_t **)rq->rq_disk->private_data;
drv->end_request(drive, 1, rq->nr_sectors);
} else
ide_end_request(drive, 1, rq->nr_sectors);

2
drivers/net/sk98lin/skge.c
View File

@ -1727,7 +1727,7 @@ struct sk_buff *pMessage) /* pointer to send-message */
pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32);
pTxd->pMBuf = pMessage;
pTxd->TBControl = Control | BMU_OWN | sk_frag->size;;
pTxd->TBControl = Control | BMU_OWN | sk_frag->size;
/*
** Do we have the last fragment?

2
drivers/net/sky2.h
View File

@ -1804,7 +1804,7 @@ struct sky2_rx_le {
__le16 length;
u8 ctrl;
u8 opcode;
} __attribute((packed));;
} __attribute((packed));
struct sky2_status_le {
__le32 status; /* also checksum */

4
drivers/net/wireless/prism54/oid_mgt.c
View File

@ -332,7 +332,7 @@ mgt_le_to_cpu(int type, void *data)
case OID_TYPE_ATTACH:{
struct obj_attachment *attach = data;
attach->id = le16_to_cpu(attach->id);
attach->size = le16_to_cpu(attach->size);;
attach->size = le16_to_cpu(attach->size);
break;
}
case OID_TYPE_SSID:
@ -401,7 +401,7 @@ mgt_cpu_to_le(int type, void *data)
case OID_TYPE_ATTACH:{
struct obj_attachment *attach = data;
attach->id = cpu_to_le16(attach->id);
attach->size = cpu_to_le16(attach->size);;
attach->size = cpu_to_le16(attach->size);
break;
}
case OID_TYPE_SSID:

2
drivers/net/wireless/spectrum_cs.c
View File

@ -147,7 +147,7 @@ struct pdi {
__le16 _len; /* length of ID and data, in words */
__le16 _id; /* record ID */
char data[0]; /* plug data */
} __attribute__ ((packed));;
} __attribute__ ((packed));
/* Functions for access to little-endian data */

2
drivers/scsi/megaraid/megaraid_mbox.c
View File

@ -2797,7 +2797,7 @@ mbox_post_sync_cmd(adapter_t *adapter, uint8_t raw_mbox[])
// available within 1 second, assume FW is initializing and wait
// for an extended amount of time
if (mbox->numstatus == 0xFF) { // status not yet available
udelay(25);;
udelay(25);
for (i = 0; mbox->numstatus == 0xFF && i < 1000; i++) {
rmb();

2
drivers/usb/image/microtek.c
View File

@ -360,7 +360,7 @@ static int mts_scsi_host_reset (Scsi_Cmnd *srb)
rc = usb_lock_device_for_reset(desc->usb_dev, desc->usb_intf);
if (rc < 0)
return FAILED;
result = usb_reset_device(desc->usb_dev);;
result = usb_reset_device(desc->usb_dev);
if (rc)
usb_unlock_device(desc->usb_dev);
return result ? FAILED : SUCCESS;

2
drivers/usb/input/hid-core.c
View File

@ -1215,7 +1215,7 @@ static void hid_irq_out(struct urb *urb, struct pt_regs *regs)
if (hid->outhead != hid->outtail) {
if (hid_submit_out(hid)) {
clear_bit(HID_OUT_RUNNING, &hid->iofl);;
clear_bit(HID_OUT_RUNNING, &hid->iofl);
wake_up(&hid->wait);
}
spin_unlock_irqrestore(&hid->outlock, flags);

2
drivers/video/aty/radeon_pm.c
View File

@ -2080,7 +2080,7 @@ static void radeon_reinitialize_M9P(struct radeonfb_info *rinfo)
OUTREG(0x2ec, 0x6332a3f0);
mdelay(17);
OUTPLL(pllPPLL_REF_DIV, rinfo->pll.ref_div);;
OUTPLL(pllPPLL_REF_DIV, rinfo->pll.ref_div);
OUTPLL(pllPPLL_DIV_0, rinfo->save_regs[92]);
mdelay(40);

2
fs/cifs/cifssmb.c
View File

@ -4908,7 +4908,7 @@ CIFSSMBSetEA(const int xid, struct cifsTconInfo *tcon, const char *fileName,
parm_data->list_len = cpu_to_le32(count);
parm_data->list[0].EA_flags = 0;
/* we checked above that name len is less than 255 */
parm_data->list[0].name_len = (__u8)name_len;;
parm_data->list[0].name_len = (__u8)name_len;
/* EA names are always ASCII */
if(ea_name)
strncpy(parm_data->list[0].name,ea_name,name_len);

2
fs/pnode.c
View File

@ -130,7 +130,7 @@ static struct vfsmount *get_source(struct vfsmount *dest,
{
struct vfsmount *p_last_src = NULL;
struct vfsmount *p_last_dest = NULL;
*type = CL_PROPAGATION;;
*type = CL_PROPAGATION;
if (IS_MNT_SHARED(dest))
*type |= CL_MAKE_SHARED;

2
include/acpi/acpi_bus.h
View File

@ -269,7 +269,7 @@ struct acpi_device_wakeup_state {
struct acpi_device_wakeup {
acpi_handle gpe_device;
acpi_integer gpe_number;;
acpi_integer gpe_number;
acpi_integer sleep_state;
struct acpi_handle_list resources;
struct acpi_device_wakeup_state state;

2
include/asm-ia64/sn/sn_sal.h
View File

@ -1037,7 +1037,7 @@ ia64_sn_get_sn_info(int fc, u8 *shubtype, u16 *nasid_bitmask, u8 *nasid_shift,
/***** BEGIN HACK - temp til old proms no longer supported ********/
if (ret_stuff.status == SALRET_NOT_IMPLEMENTED) {
int nasid = get_sapicid() & 0xfff;;
int nasid = get_sapicid() & 0xfff;
#define SH_SHUB_ID_NODES_PER_BIT_MASK 0x001f000000000000UL
#define SH_SHUB_ID_NODES_PER_BIT_SHFT 48
if (shubtype) *shubtype = 0;

2
net/ipv4/inet_hashtables.c
View File

@ -315,7 +315,7 @@ int inet_hash_connect(struct inet_timewait_death_row *death_row,
spin_unlock(&head->lock);
if (tw) {
inet_twsk_deschedule(tw, death_row);;
inet_twsk_deschedule(tw, death_row);
inet_twsk_put(tw);
}

2
net/ipv4/netfilter/ip_nat_standalone.c
View File

@ -394,7 +394,7 @@ static int init_or_cleanup(int init)
ret = nf_register_hook(&ip_nat_local_out_ops);
if (ret < 0) {
printk("ip_nat_init: can't register local out hook.\n");
goto cleanup_adjustout_ops;;
goto cleanup_adjustout_ops;
}
ret = nf_register_hook(&ip_nat_local_in_ops);
if (ret < 0) {

2
net/tipc/link.c
View File

@ -1629,7 +1629,7 @@ void tipc_link_retransmit(struct link *l_ptr, struct sk_buff *buf,
tipc_msg_print(TIPC_CONS, buf_msg(buf), ">RETR>");
info("...Retransmitted %u times\n",
l_ptr->stale_count);
link_print(l_ptr, TIPC_CONS, "Resetting Link\n");;
link_print(l_ptr, TIPC_CONS, "Resetting Link\n");
tipc_link_reset(l_ptr);
break;
}

4
sound/ppc/toonie.c
View File

@ -117,7 +117,7 @@ static int toonie_get_mute_switch(struct snd_kcontrol *kcontrol,
gp = &mix->amp_mute_gpio;
break;
default:
return -EINVAL;;
return -EINVAL;
}
ucontrol->value.integer.value[0] = !check_audio_gpio(gp);
return 0;
@ -145,7 +145,7 @@ static int toonie_put_mute_switch(struct snd_kcontrol *kcontrol,
gp = &mix->amp_mute_gpio;
break;
default:
return -EINVAL;;
return -EINVAL;
}
val = ! check_audio_gpio(gp);
if (val != ucontrol->value.integer.value[0]) {