]> git.neil.brown.name Git - history.git/commitdiff
[PATCH] double semicolon cleanup
authorAlexander Stohr <alexander.stohr@gmx.de>
Wed, 31 Mar 2004 00:48:12 +0000 (16:48 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 31 Mar 2004 00:48:12 +0000 (16:48 -0800)
This cleans up a larger amount of superfluos ";;" statements in current
Linux kernel sources by converting them to the regular single ";"
statments.

It seems to be a common problem that at the end of a line the semicolon
key is producing an echo.

88 files changed:
arch/alpha/boot/misc.c
arch/arm/kernel/sys_arm.c
arch/arm26/kernel/sys_arm.c
arch/ia64/sn/fakeprom/fw-emu.c
arch/ia64/sn/io/sn2/pciio.c
arch/ia64/sn/io/sn2/pic.c
arch/m68k/mvme16x/16xints.c
arch/mips/kernel/sysirix.c
arch/ppc/mm/pgtable.c
arch/sparc64/solaris/timod.c
drivers/acpi/sleep/proc.c
drivers/block/cpqarray.c
drivers/cdrom/sbpcd.c
drivers/char/drm/drm_memory_debug.h
drivers/char/drm/gamma_context.h
drivers/char/dz.c
drivers/char/ftape/compressor/lzrw3.c
drivers/char/mwave/smapi.c
drivers/char/qtronix.c
drivers/char/vt.c
drivers/ide/pci/trm290.c
drivers/input/joystick/gf2k.c
drivers/isdn/hardware/eicon/message.c
drivers/isdn/hisax/hisax_fcpcipnp.c
drivers/isdn/hisax/niccy.c
drivers/isdn/hisax/nj_s.c
drivers/media/video/zoran_driver.c
drivers/mtd/nand/nand.c
drivers/net/acenic.h
drivers/net/hamradio/hdlcdrv.c
drivers/net/mace.c
drivers/net/sk98lin/skgepnmi.c
drivers/net/typhoon.c
drivers/net/wireless/arlan-main.c
drivers/net/wireless/atmel.c
drivers/net/wireless/hermes.h
drivers/pci/hotplug/cpqphp_core.c
drivers/pci/hotplug/pciehp_hpc.c
drivers/pcmcia/sa1100_pangolin.c
drivers/s390/net/qeth.c
drivers/s390/scsi/zfcp_erp.c
drivers/scsi/aic7xxx/aic7770.c
drivers/scsi/cpqfcTSinit.c
drivers/scsi/dec_esp.c
drivers/scsi/dpt_i2o.c
drivers/scsi/gdth.c
drivers/scsi/i91uscsi.c
drivers/scsi/in2000.c
drivers/scsi/pci2000.c
drivers/scsi/pci2220i.c
drivers/scsi/qlogicfas.c
drivers/scsi/qlogicfc.c
drivers/scsi/qlogicisp.c
drivers/scsi/scsiiom.c
drivers/scsi/wd33c93.c
drivers/usb/media/se401.c
drivers/usb/media/stv680.c
drivers/usb/serial/empeg.c
drivers/usb/serial/mct_u232.c
drivers/video/aty/radeon_monitor.c
drivers/video/fbmon.c
drivers/video/i810/i810_main.c
drivers/video/sis/init301.c
fs/cifs/connect.c
fs/intermezzo/journal_xfs.c
fs/smbfs/sock.c
kernel/exec_domain.c
lib/bitmap.c
net/ipv4/netfilter/ip_nat_snmp_basic.c
net/ipv4/tcp_ipv4.c
net/irda/irlan/irlan_filter.c
net/irda/irttp.c
net/key/af_key.c
net/sched/sch_hfsc.c
net/sctp/bind_addr.c
net/sctp/sm_make_chunk.c
net/sctp/socket.c
net/sunrpc/auth_gss/svcauth_gss.c
security/selinux/hooks.c
sound/oss/cs46xx.c
sound/oss/i810_audio.c
sound/oss/nec_vrc5477.c
sound/oss/rme96xx.c
sound/oss/soundcard.c
sound/oss/sys_timer.c
sound/parisc/harmony.c
sound/pci/au88x0/au88x0_synth.c
sound/pci/cs46xx/dsp_spos.c

index 0cdb531273b5cc0f8601e315b5dfe1ce840c814e..b8119502fb84b6e1214ae36fc9aea7b1653c0e80 100644 (file)
@@ -25,7 +25,7 @@
 #define memzero(s,n)   memset ((s),0,(n))
 #define puts           srm_printk
 extern long srm_printk(const char *, ...)
-     __attribute__ ((format (printf, 1, 2)));;
+     __attribute__ ((format (printf, 1, 2)));
 
 /*
  * gzip delarations
index 64036b9a89b9d586824aeb9f9bb30e7352d76647..dd86d215337fc253348706f0bba1e0a08abe1039 100644 (file)
@@ -100,7 +100,7 @@ asmlinkage int old_mmap(struct mmap_arg_struct *arg)
        struct mmap_arg_struct a;
 
        if (copy_from_user(&a, arg, sizeof(a)))
-               goto out;;
+               goto out;
 
        error = -EINVAL;
        if (a.offset & ~PAGE_MASK)
index 0ebb04972345eeef733b1d6ec90cd323f5318eb3..0d1cdd503f3b556e3a497bed2a603542316e27b9 100644 (file)
@@ -101,7 +101,7 @@ asmlinkage int old_mmap(struct mmap_arg_struct *arg)
        struct mmap_arg_struct a;
 
        if (copy_from_user(&a, arg, sizeof(a)))
-               goto out;;
+               goto out;
 
        error = -EINVAL;
        if (a.offset & ~PAGE_MASK)
index c332d63d11672dca666b04f414d6cdb17eb16001..7832af4d652f00a30cc2225560c110182dd9c712 100644 (file)
@@ -397,7 +397,7 @@ efi_set_virtual_address_map(void)
         fix_virt_function_pointer((void**)&runtime->set_variable);
         fix_virt_function_pointer((void**)&runtime->get_next_high_mono_count);
         fix_virt_function_pointer((void**)&runtime->reset_system);
-        return EFI_SUCCESS;;
+        return EFI_SUCCESS;
 }
 
 void
index b80b6fefc4835a65dee86b0821ed556f9121a72e..dfae6b530cc8c504048031e5afd84b81c078bf11 100644 (file)
@@ -926,7 +926,7 @@ pciio_device_win_alloc(struct resource *root_resource,
                win_alloc->wa_pages = size;
        }
 
-       return new_res->start;;
+       return new_res->start;
 }
 
 /*
index d6e799ed5992f9a4ee3c9376fbc8252d39d9b71b..775495af6043eef62a16ebc8bfdc569a1edf4bee 100644 (file)
@@ -685,7 +685,7 @@ pic_attach2(vertex_hdl_t xconn_vhdl, void *bridge,
 
     /* Block off the range used by PROM. */
     res->start = prom_base_addr;
-    res->end = prom_base_addr + (prom_base_size - 1);;
+    res->end = prom_base_addr + (prom_base_size - 1);
     status = request_resource(&pcibr_soft->bs_mem_win_root_resource, res);
     if (status)
        panic("PCIBR:Unable to request_resource()\n");
index 1b3b478a9da4c7d9b2ea443f8b1fadcb1e542550..793ef735b59c4900117c143c1ab1c986e5b060d1 100644 (file)
@@ -98,7 +98,7 @@ void mvme16x_free_irq(unsigned int irq, void *dev_id)
                printk("%s: Removing probably wrong IRQ %d from %s\n",
                       __FUNCTION__, irq, irq_tab[irq-64].devname);
 
-       irq_tab[irq-64].handler = mvme16x_defhand;;
+       irq_tab[irq-64].handler = mvme16x_defhand;
        irq_tab[irq-64].flags   = IRQ_FLG_STD;
        irq_tab[irq-64].dev_id  = NULL;
        irq_tab[irq-64].devname = NULL;
index c10a2ecc789370038551b39ef241d8b811abe025..924cbe9988dbf9fcc447fdfec23b8bf23e6724ec 100644 (file)
@@ -1249,9 +1249,9 @@ static int irix_xstat64_xlate(struct kstat *stat, void *ubuf)
        ks.st_atime.tv_sec = (s32) stat->atime.tv_sec;
        ks.st_atime.tv_nsec = stat->atime.tv_nsec;
        ks.st_mtime.tv_sec = (s32) stat->mtime.tv_sec;
-       ks.st_mtime.tv_nsec = stat->mtime.tv_nsec;;
+       ks.st_mtime.tv_nsec = stat->mtime.tv_nsec;
        ks.st_ctime.tv_sec = (s32) stat->ctime.tv_sec;
-       ks.st_ctime.tv_nsec = stat->ctime.tv_nsec;;
+       ks.st_ctime.tv_nsec = stat->ctime.tv_nsec;
 
        ks.st_blksize = (s32) stat->blksize;
        ks.st_blocks = (long long) stat->blocks;
index b62b30ca4f78c84609efdef5b04f68c8a240598d..78ea44090efaab1a05a988874a8d69bbc4434465 100644 (file)
@@ -143,7 +143,7 @@ ioremap64(unsigned long long addr, unsigned long size)
 void *
 ioremap(phys_addr_t addr, unsigned long size)
 {
-       phys_addr_t addr64 = fixup_bigphys_addr(addr, size);;
+       phys_addr_t addr64 = fixup_bigphys_addr(addr, size);
 
        return ioremap64(addr64, size);
 }
index 137f8c5b247f5c96393e03451d08e10f124b25ec..feebc8296c4c48c52a8b138b98021eb6b66fe4d8 100644 (file)
@@ -296,7 +296,7 @@ static int timod_optmgmt(unsigned int fd, int flag, char *opt_buf, int opt_len,
                SOLD("calling GETSOCKOPT");
                set_fs(KERNEL_DS);
                error = sys_socketcall(SYS_GETSOCKOPT, args);
-               set_fs(old_fs);;
+               set_fs(old_fs);
                if (error) {
                        failed = TBADOPT;
                        break;
index 5decea39bd5037218e0cce4325a422400f4134ea..a64ef154db0808a62e55b2cf5c398d1764311ba7 100644 (file)
@@ -99,7 +99,7 @@ static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset)
        if (acpi_gbl_FADT->mon_alrm)
                mo = CMOS_READ(acpi_gbl_FADT->mon_alrm);
        else
-               mo = CMOS_READ(RTC_MONTH);;
+               mo = CMOS_READ(RTC_MONTH);
        if (acpi_gbl_FADT->century)
                yr = CMOS_READ(acpi_gbl_FADT->century) * 100 + CMOS_READ(RTC_YEAR);
        else
index 5ee6b2e8061d420b4b86fb461f806d317afc4fa3..53e90fcbcbe30e7ec7817b52dca38568d1a71f66 100644 (file)
@@ -1738,7 +1738,7 @@ static void getgeometry(int ctlr)
                 return;
         }
 
-       info_p->log_drives = id_ctlr_buf->nr_drvs;;
+       info_p->log_drives = id_ctlr_buf->nr_drvs;
        for(i=0;i<4;i++)
                info_p->firm_rev[i] = id_ctlr_buf->firm_rev[i];
        info_p->ctlr_sig = id_ctlr_buf->cfg_sig;
index decbb9bf995026280ae7d232ff51da647cfe51e4..8e81cff499668170738d25659d6886a9e582937e 100644 (file)
@@ -5120,7 +5120,7 @@ static int sbp_data(struct request *req)
                        for ( ; try!=0;try--)
                        {
                                j=inb(CDi_status);
-                               if (!(j&s_not_data_ready)) break;;
+                               if (!(j&s_not_data_ready)) break;
                                if (!(j&s_not_result_ready)) break;
                                if (fam0LV_drive) if (j&s_attention) break;
                        }
index 753be632be891613251a7f4d0c46f28c81072a68..4d57979559888b508c1a390d4acf08f1cbe678f8 100644 (file)
@@ -385,7 +385,7 @@ int DRM(free_agp)(DRM_AGP_MEM *handle, int pages)
        if (!handle) {
                DRM_MEM_ERROR(DRM_MEM_TOTALAGP,
                              "Attempt to free NULL AGP handle\n");
-               return retval;;
+               return retval;
        }
 
        if (DRM(agp_free_memory)(handle)) {
index 2338cb3850842303dc914d1c297d7a88c5bf5d45..df319c039fcc6bda179e1a97c999396cd3345ad2 100644 (file)
@@ -84,7 +84,7 @@ ssize_t DRM(read)(struct file *filp, char *buf, size_t count, loff_t *off)
        }
 
        wake_up_interruptible(&dev->buf_writers);
-       return DRM_MIN(avail, count);;
+       return DRM_MIN(avail, count);
 }
 
 
index 2a1d323393df7947e21998b2922e87d9c2db099a..23630030e6d8ab09a7cc1b46f6a451144b71ae9a 100644 (file)
@@ -431,7 +431,7 @@ static void do_softint (void *private_data)
 static void do_serial_hangup (void *private_data)
 {
        struct dz_serial *info = (struct dz_serial *) private_data;
-       struct tty_struct *tty = info->tty;;
+       struct tty_struct *tty = info->tty;
         
        if (!tty)
                return;
index 64ad32556f5cdaeb135a27b4a93eff620f55dfa2..a45cd2ba5af3d31a58bb0c5916c4d9ae5b9cdff3 100644 (file)
@@ -701,7 +701,7 @@ ULONG *p_dst_len;
           /* been postponed for lack of bytes.                                */
           if (literals>0)
             {
-             register UBYTE *r=p_ziv-literals;;
+             register UBYTE *r=p_ziv-literals;
              hash[HASH(r)]=r;
              if (literals==2)
                 {r++; hash[HASH(r)]=r;}
index 009a41cfa0f7dfbd86f08dbd995d73b8619b05b8..08ef7cabdd25995fe9a7170e96981ca583e22eaf 100644 (file)
@@ -447,7 +447,7 @@ int smapi_set_DSP_cfg(void)
        if (bRC) goto exit_smapi_request_error;
 
        if (mwave_3780i_io) {
-               usDI = dspio_index;;
+               usDI = dspio_index;
        }
        if (mwave_3780i_irq) {
                usSI = (usSI & 0xff00) | mwave_3780i_irq;
index 64276b9d26e12add1cc8e5ae5d7c7e27a5f5591d..4698af2d62e36924d1eac0e1d4a57e6ae4d15549 100644 (file)
@@ -206,7 +206,7 @@ static void kbd_int_handler(int irq, void *dev_id, struct pt_regs *regs)
        unsigned char int_status;
 
        cir = (struct cir_port *)dev_id;
-       int_status = get_int_status(cir);;
+       int_status = get_int_status(cir);
        if (int_status & 0x4) {
                clear_fifo(cir);
                return;
index 7cb653b8422727c08bf5a53eeda42915f7e9e628..20fcaae1955d377d8886e756576935dc56444d16 100644 (file)
@@ -2315,7 +2315,7 @@ int tioclinux(struct tty_struct *tty, unsigned long arg)
                        break;
                case TIOCL_SETVESABLANK:
                        set_vesa_blanking(arg);
-                       break;;
+                       break;
                case TIOCL_SETKMSGREDIRECT:
                        if (!capable(CAP_SYS_ADMIN)) {
                                ret = -EPERM;
index ac64dc2770cd0988fb0edf159d5a735514182885..8a1f88faca71c508d614b851fd9c3aac0db4ff2a 100644 (file)
@@ -280,7 +280,7 @@ static int trm290_ide_dma_begin (ide_drive_t *drive)
 static int trm290_ide_dma_end (ide_drive_t *drive)
 {
        ide_hwif_t *hwif = HWIF(drive);
-       u16 status = 0;;
+       u16 status = 0;
 
        drive->waiting_for_dma = 0;
        /* purge DMA mappings */
index d0bbb1fdf6d4d171ddb5fb6c7f9a8201665874e7..986b45a25f52482e71cd943ad163e855b4ddc46e 100644 (file)
@@ -109,7 +109,7 @@ static int gf2k_read_packet(struct gameport *gameport, int length, char *data)
        local_irq_save(flags);
 
        gameport_trigger(gameport);
-       v = gameport_read(gameport);;
+       v = gameport_read(gameport);
 
        while (t > 0 && i < length) {
                t--; u = v;
index 2f2dfe384e3fe5163f5d68bf5ef22c08d949ff70..03d89d4265a01ff19a1b9c9e58b1cb8614e33043 100644 (file)
@@ -14821,7 +14821,7 @@ void group_optimization(DIVA_CAPI_ADAPTER   * a, PLCI   * plci)
   for(i=0;i<MAX_CIP_TYPES;i++)
   {
     info_mask_group[i] = 0;
-    cip_mask_group [i] = 0;;
+    cip_mask_group [i] = 0;
   }
   for(i=0;i<MAX_APPL;i++)
   {
index c8bc167f71b36e1141f33fa789a75a6dc63e0aac..98c408e3f30957ea7821fd4949f45a56ee74a82b 100644 (file)
@@ -762,7 +762,7 @@ static int __devinit fcpcipnp_setup(struct fritz_adapter *adapter)
        adapter->isac.priv = adapter;
        switch (adapter->type) {
        case AVM_FRITZ_PCIV2:
-               adapter->isac.read_isac       = &fcpci2_read_isac;;
+               adapter->isac.read_isac       = &fcpci2_read_isac;
                adapter->isac.write_isac      = &fcpci2_write_isac;
                adapter->isac.read_isac_fifo  = &fcpci2_read_isac_fifo;
                adapter->isac.write_isac_fifo = &fcpci2_write_isac_fifo;
@@ -771,7 +771,7 @@ static int __devinit fcpcipnp_setup(struct fritz_adapter *adapter)
                adapter->write_ctrl           = &fcpci2_write_ctrl;
                break;
        case AVM_FRITZ_PCI:
-               adapter->isac.read_isac       = &fcpci_read_isac;;
+               adapter->isac.read_isac       = &fcpci_read_isac;
                adapter->isac.write_isac      = &fcpci_write_isac;
                adapter->isac.read_isac_fifo  = &fcpci_read_isac_fifo;
                adapter->isac.write_isac_fifo = &fcpci_write_isac_fifo;
@@ -780,7 +780,7 @@ static int __devinit fcpcipnp_setup(struct fritz_adapter *adapter)
                adapter->write_ctrl           = &fcpci_write_ctrl;
                break;
        case AVM_FRITZ_PNP:
-               adapter->isac.read_isac       = &fcpci_read_isac;;
+               adapter->isac.read_isac       = &fcpci_read_isac;
                adapter->isac.write_isac      = &fcpci_write_isac;
                adapter->isac.read_isac_fifo  = &fcpci_read_isac_fifo;
                adapter->isac.write_isac_fifo = &fcpci_write_isac_fifo;
index 61d59abfe68222f95b87d09bf00feaceeec34524..88cce430cfd03945fe61154f38543d670d9ec1e9 100644 (file)
@@ -271,7 +271,7 @@ setup_niccy(struct IsdnCard *card)
                        }
                        card->para[1] = pnp_port_start(pnp_d, 0);
                        card->para[2] = pnp_port_start(pnp_d, 1);
-                       card->para[0] = pnp_irq(pnp_d, 0);;
+                       card->para[0] = pnp_irq(pnp_d, 0);
                        if (!card->para[0] || !card->para[1] || !card->para[2]) {
                                printk(KERN_ERR "NiccyPnP:some resources are missing %ld/%lx/%lx\n",
                                        card->para[0], card->para[1], card->para[2]);
index 240197c1c9574055ef80a4cbbcb44b5beedd0a56..5fd47f618e43b0dc775e43577266c42ee7940013 100644 (file)
@@ -80,7 +80,7 @@ netjet_s_interrupt(int intno, void *dev_id, struct pt_regs *regs)
                        printk(KERN_WARNING "nj LOCK_ATOMIC s0val %x->%x\n",
                                cs->hw.njet.last_is0, s0val);
                        spin_unlock_irqrestore(&cs->lock, flags);
-                       return IRQ_HANDLED;;
+                       return IRQ_HANDLED;
                }
                cs->hw.njet.irqstat0 = s0val;
                if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_READ) != 
index 3652fd312648414ec095533972e13d6a5df3928a..6785211e0ec06e126538d1affd4c7ca63772dddd 100644 (file)
@@ -2815,7 +2815,7 @@ zoran_do_ioctl (struct inode *inode,
                                     fh->jpg_settings.TmpDcm);
                                fmt->fmt.pix.sizeimage =
                                    zoran_v4l2_calc_bufsize(&fh->
-                                                           jpg_settings);;
+                                                           jpg_settings);
                                fmt->fmt.pix.pixelformat =
                                    V4L2_PIX_FMT_MJPEG;
                                if (fh->jpg_settings.TmpDcm == 1)
index 85cee7b17c8c9115574ecc00e81c3a208ed3010b..e9919425b32250e50c15accddc5118c5c3f5d3d0 100644 (file)
@@ -1060,7 +1060,7 @@ static int nand_writev_ecc (struct mtd_info *mtd, const struct iovec *vecs, unsi
                        goto out;
 
                /* Update written bytes count */
-               written += mtd->oobblock;;
+               written += mtd->oobblock;
 
                /* Increment page address */
                page++;
@@ -1192,7 +1192,7 @@ erase_exit:
        nand_deselect ();
        spin_unlock_bh (&this->chip_lock);
 
-       ret = instr->state == MTD_ERASE_DONE ? 0 : -EIO;;
+       ret = instr->state == MTD_ERASE_DONE ? 0 : -EIO;
        /* Do call back function */
        if (!ret && instr->callback)
                instr->callback (instr);
index de273f7583e66014bfa04a4cb4d03adad22d8b06..eb516e155010261ad1b66c5d4df1053c6fa0bacd 100644 (file)
@@ -696,7 +696,7 @@ struct ace_private
        char                    name[48];
 #ifdef INDEX_DEBUG
        spinlock_t              debug_lock
-                               __attribute__ ((aligned (SMP_CACHE_BYTES)));;
+                               __attribute__ ((aligned (SMP_CACHE_BYTES)));
        u32                     last_tx, last_std_rx, last_mini_rx;
 #endif
        struct net_device_stats stats;
index 787ca8fad90aea2cde8c8d7fa2787327509fe5e7..103baaff18a765ee7cb90c1376b8388fa8a3d20a 100644 (file)
@@ -737,7 +737,7 @@ static void hdlcdrv_setup(struct net_device *dev)
        static const struct hdlcdrv_channel_params dflt_ch_params = { 
                20, 2, 10, 40, 0 
        };
-       struct hdlcdrv_state *s = dev->priv;;
+       struct hdlcdrv_state *s = dev->priv;
 
        /*
         * initialize the hdlcdrv_state struct
index 3f5033046fbcc79b901f4ba6f000cd2e5edeb8a3..b44bb93948ff692c9ffae27df1213891477eda2b 100644 (file)
@@ -202,7 +202,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_match *m
                rc = -ENOMEM;
                goto err_unmap_tx_dma;
        }
-       mp->rx_dma_intr = macio_irq(mdev, 2);;
+       mp->rx_dma_intr = macio_irq(mdev, 2);
 
        mp->tx_cmds = (volatile struct dbdma_cmd *) DBDMA_ALIGN(mp + 1);
        mp->rx_cmds = mp->tx_cmds + NCMDS_TX * N_TX_RING + 1;
index 2a13a9d7f12552b92d5983a8c43783e584da18b4..58e1a5be913f2ae7d26d6e72ab4d95cd8a9449d4 100644 (file)
@@ -7684,7 +7684,7 @@ SK_U32 NetIndex)  /* NetIndex (0..n), in single net mode allways zero */
                         to the low-power state.
                         A miniport driver must always return NDIS_STATUS_SUCCESS
                         to a query of OID_PNP_QUERY_POWER. */
-                       *pLen = sizeof(SK_DEVICE_POWER_STATE);;
+                       *pLen = sizeof(SK_DEVICE_POWER_STATE);
             RetCode = SK_PNMI_ERR_OK;
                        break;
 
index 33e5e2b96ff4b0ecce2e9a5f054542490346050f..39949dbb1599bff0cb482b87853a7fa41fcdc0e7 100644 (file)
@@ -1318,7 +1318,7 @@ typhoon_init_interface(struct typhoon *tp)
        tp->rxHiRing.ringBase = (u8 *) tp->shared->rxHi;
        tp->rxBuffRing.ringBase = (u8 *) tp->shared->rxBuff;
        tp->cmdRing.ringBase = (u8 *) tp->shared->cmd;
-       tp->respRing.ringBase = (u8 *) tp->shared->resp;;
+       tp->respRing.ringBase = (u8 *) tp->shared->resp;
 
        tp->txLoRing.writeRegister = TYPHOON_REG_TX_LO_READY;
        tp->txHiRing.writeRegister = TYPHOON_REG_TX_HI_READY;
index c6af5315cb035448c64a61652d7fefdfd122e511..ced3f5948d6d116a0a51d95073c4a81a65022c6e 100644 (file)
@@ -1281,7 +1281,7 @@ static void arlan_tx_done_interrupt(struct net_device *dev, int status)
                        priv->retransmissions = 0;
                        if (priv->Conf->tx_delay_ms)
                        {
-                               priv->tx_done_delayed = jiffies + (priv->Conf->tx_delay_ms * HZ) / 1000 + 1;;
+                               priv->tx_done_delayed = jiffies + (priv->Conf->tx_delay_ms * HZ) / 1000 + 1;
                        }
                        else
                        {
index 5d709a260c87de243f00a4bd623ac28c4b535221..8062c074a30290be5ac98eb34bca1d78d9dd906c 100644 (file)
@@ -537,7 +537,7 @@ struct atmel_private {
        int channel;
        int reg_domain;
        int tx_rate;
-       int auto_tx_rate;;
+       int auto_tx_rate;
        int rts_threshold;
        int frag_threshold;
        int long_retry, short_retry;
index b29e42a146f18133bfd2c2174d39719688d2d0c1..58adf40048a081f73ff2d87ddaa733546b37e4e0 100644 (file)
@@ -364,7 +364,7 @@ static inline int hermes_inquire(hermes_t *hw, u16 rid)
 /* Note that for the next two, the count is in 16-bit words, not bytes */
 static inline void hermes_read_words(struct hermes *hw, int off, void *buf, unsigned count)
 {
-       off = off << hw->reg_spacing;;
+       off = off << hw->reg_spacing;
 
        if (hw->io_space) {
                insw(hw->iobase + off, buf, count);
index f3d61e26e0c6eef9ab322976f7a63070aa45c749..9f5656bf2d63c9c72603c2fa5d6fcd7de7e243d8 100644 (file)
@@ -1342,7 +1342,7 @@ static int one_time_init(void)
        cpqhp_rom_start = ioremap(ROM_PHY_ADDR, ROM_PHY_LEN);
        if (!cpqhp_rom_start) {
                err ("Could not ioremap memory region for ROM\n");
-               retval = -EIO;;
+               retval = -EIO;
                goto error;
        }
        
@@ -1353,14 +1353,14 @@ static int one_time_init(void)
        smbios_table = detect_SMBIOS_pointer(cpqhp_rom_start, cpqhp_rom_start + ROM_PHY_LEN);
        if (!smbios_table) {
                err ("Could not find the SMBIOS pointer in memory\n");
-               retval = -EIO;;
+               retval = -EIO;
                goto error;
        }
 
        smbios_start = ioremap(readl(smbios_table + ST_ADDRESS), readw(smbios_table + ST_LENGTH));
        if (!smbios_start) {
                err ("Could not ioremap memory region taken from SMBIOS values\n");
-               retval = -EIO;;
+               retval = -EIO;
                goto error;
        }
 
index f9adc319a2748a29030a25a8ab236b0cb90c65e8..ee5b640fe3b2ce38a2c0962c9e30a1c7364203ed 100644 (file)
@@ -915,7 +915,7 @@ static irqreturn_t pcie_isr(int IRQ, void *dev_id, struct pt_regs *regs)
                rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_CTRL, temp_word);
                if (rc) {
                        err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
-                       return IRQ_NONE;;
+                       return IRQ_NONE;
                }
 
                temp_word = (temp_word & ~HP_INTR_ENABLE) | 0x00;
@@ -923,7 +923,7 @@ static irqreturn_t pcie_isr(int IRQ, void *dev_id, struct pt_regs *regs)
                rc = hp_register_write_word(php_ctlr->pci_dev, SLOT_CTRL, temp_word);
                if (rc) {
                        err("%s : hp_register_write_word SLOT_CTRL failed\n", __FUNCTION__);
-                       return IRQ_NONE;;
+                       return IRQ_NONE;
                }
        }
        
index 516a7dc9f5c7d78df4c09ffe9115e56c91346a70..c32504b5b7404eaf1cebb79769c0b78a4a8390fc 100644 (file)
@@ -54,7 +54,7 @@ static void
 pangolin_pcmcia_socket_state(struct sa1100_pcmcia_socket *skt,
                             struct pcmcia_state *state)
 {
-       unsigned long levels = GPLR;;
+       unsigned long levels = GPLR;
 
        state->detect=((levels & GPIO_PCMCIA_CD)==0)?1:0;
        state->ready=(levels & GPIO_PCMCIA_IRQ)?1:0;
index 6ffddcf0116415a47355f1a73ed6424ded75b612..ebef0a9c91cf4ba554a26331d64cd15438790b8f 100644 (file)
@@ -5930,7 +5930,7 @@ __qeth_try_to_flush_packets(struct qeth_card *card, int last_pci_hit,
                        LOW_WATERMARK_PACK);
        /* first_element is the last buffer that we got back from hydra */
        if (!switch_state && !last_pci_hit)
-               return;;
+               return;
        QETH_DBF_CARD3(0, trace, "stchcw", card);
        if (atomic_swap(&card->outbound_ringbuffer_lock[queue], QETH_LOCK_FLUSH)
            == QETH_LOCK_UNLOCKED) {
@@ -6883,7 +6883,7 @@ qeth_idx_activate_read(struct qeth_card *card)
 
        card->portname_required =
            ((!QETH_IDX_NO_PORTNAME_REQUIRED(card->dma_stuff->recbuf)) &&
-            (card->type == QETH_CARD_TYPE_OSAE));;
+            (card->type == QETH_CARD_TYPE_OSAE));
 
        /*
         * however, as the portname indication of OSA is wrong, we have to
index 20618f67f7cfc717c2d74499b2c01d0492780232..ca59659cf1fd51197f0eea1f5e629a4ec842bb3b 100644 (file)
@@ -2706,7 +2706,7 @@ zfcp_erp_adapter_strategy_open_fsf_xconfig(struct zfcp_erp_action *erp_action)
                ZFCP_LOG_INFO("error: Exchange of configuration data between "
                              "the adapter %s and the device driver failed.\n",
                              zfcp_get_busid_by_adapter(adapter));
-               retval = ZFCP_ERP_FAILED;;
+               retval = ZFCP_ERP_FAILED;
        }
 
        return retval;
index c6ef9b7972852e6166b305299fc1ccbbbfdaf00b..92703bb35982224cc48252edf1969db29b4d79cd 100644 (file)
@@ -64,7 +64,7 @@ static int aic7770_suspend(struct ahc_softc *ahc);
 static int aic7770_resume(struct ahc_softc *ahc);
 static int aha2840_load_seeprom(struct ahc_softc *ahc);
 static ahc_device_setup_t ahc_aic7770_VL_setup;
-static ahc_device_setup_t ahc_aic7770_EISA_setup;;
+static ahc_device_setup_t ahc_aic7770_EISA_setup;
 static ahc_device_setup_t ahc_aic7770_setup;
 
 struct aic7770_identity aic7770_ident_table[] =
index af8796ed9e04afcc1f3f2bc56a44dbcef5af5db5..771c206eaa654233d5bd21d1b1f3149eae357be7 100644 (file)
@@ -216,7 +216,7 @@ static void Cpqfc_initHBAdata(CPQFCHBA *cpqfcHBAdata, struct pci_dev *PciDev )
   cpqfcHBAdata->fcChip.InitializeTachyon = CpqTsInitializeTachLite;  
   cpqfcHBAdata->fcChip.LaserControl = CpqTsLaserControl;  
   cpqfcHBAdata->fcChip.ProcessIMQEntry = CpqTsProcessIMQEntry;
-  cpqfcHBAdata->fcChip.InitializeFrameManager = CpqTsInitializeFrameManager;;  
+  cpqfcHBAdata->fcChip.InitializeFrameManager = CpqTsInitializeFrameManager;
   cpqfcHBAdata->fcChip.ReadWriteWWN = CpqTsReadWriteWWN;
   cpqfcHBAdata->fcChip.ReadWriteNVRAM = CpqTsReadWriteNVRAM;
 
index 770b2f251db7115a6c7ee859102d181e1755e8ff..737b5982593ac20792e9a5bac7f7895167ed14e1 100644 (file)
@@ -378,7 +378,7 @@ static void dma_drain(struct NCR_ESP *esp)
 
 static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd * sp)
 {
-       return sp->SCp.this_residual;;
+       return sp->SCp.this_residual;
 }
 
 static void dma_dump_state(struct NCR_ESP *esp)
index 7af26405170ecb92b261e08c06f1f9213b28bc7e..8740123b87ae6515f0f9f168da1e27e20aaa3c71 100644 (file)
@@ -2161,7 +2161,7 @@ static s32 adpt_scsi_register(adpt_hba* pHba,Scsi_Host_Template * sht)
        (adpt_hba*)(host->hostdata[0]) = pHba;
        pHba->host = host;
 
-       host->irq = pHba->pDev->irq;;
+       host->irq = pHba->pDev->irq;
        /* no IO ports, so don't have to set host->io_port and 
         * host->n_io_port
         */
index 1a948148ff22dcbde9960b0db2cf012143875598..71e66844c3fdd725700fe81d028102fa7c77f6dd 100644 (file)
@@ -1358,7 +1358,7 @@ GDTH_INITFUNC(static int, gdth_init_pci(gdth_pci_str *pcistr,gdth_ha_str *ha))
         
         /* disable board interrupts, deinit services */
         gdth_writeb(0xff, &dp6_ptr->io.irqdel);
-        gdth_writeb(0x00, &dp6_ptr->io.irqen);;
+        gdth_writeb(0x00, &dp6_ptr->io.irqen);
         gdth_writeb(0x00, &dp6_ptr->u.ic.S_Status);
         gdth_writeb(0x00, &dp6_ptr->u.ic.Cmd_Index);
 
index 1bbffe5e1b906149910c929a3255c90743f5573d..53f319d2e7ec5ebe303fa3e5839567c54a6bc595 100644 (file)
@@ -2133,7 +2133,7 @@ int int_tul_bad_seq(HCS * pCurHcb)
                tul_append_done_scb(pCurHcb, pCurScb);
        }
        for (i = 0; i < pCurHcb->HCS_MaxTar; i++) {
-               pCurHcb->HCS_Tcs[i].TCS_Flags &= ~(TCF_SYNC_DONE | TCF_WDTR_DONE);;
+               pCurHcb->HCS_Tcs[i].TCS_Flags &= ~(TCF_SYNC_DONE | TCF_WDTR_DONE);
        }
        return (-1);
 }
index 7ba22fdde0e4fd4c7c1fc99c8e927645856e583f..7bdf75f251f51e60ae8a1b235cdef1583812a8ff 100644 (file)
@@ -2288,7 +2288,7 @@ static int in2000_proc_info(struct Scsi_Host *instance, char *buf, char **start,
                return 0;       /* return 0 to signal end-of-file */
        }
        if (off > 0x40000)      /* ALWAYS stop after 256k bytes have been read */
-               stop = 1;;
+               stop = 1;
        if (hd->proc & PR_STOP) /* stop every other time */
                stop = 1;
        return strlen(bp);
index 7891f610f788064e86bb86548685e5bc0b5c08b3..575944aaff40f19c47a206200b9a25dd67d18fb7 100644 (file)
@@ -320,7 +320,7 @@ static irqreturn_t Irq_Handler (int irq, void *dev_id, struct pt_regs *regs)
 
        outb_p (0xFF, padapter->tag);                                                                                           // clear the op interrupt
        outb_p (CMD_DONE, padapter->cmd);                                                                                       // complete the op
-       goto irq_return;;                                                                                                                       // done, but, with what?
+       goto irq_return;                                                                                                                        // done, but, with what?
 
 unmapProceed:;
        if ( !bus )
index 145e9114d5a2cd968101812ef7661a975afdcc00..2ea7c705ffc0323cfbec8d4b6a578bb916361045 100644 (file)
@@ -1389,7 +1389,7 @@ static void ReconTimerExpiry (unsigned long data)
                         (pdev->DiskMirror[0].pairIdentifier == (pdev->DiskMirror[1].pairIdentifier ^ 1)) )
                        {
                        if ( (pdev->DiskMirror[0].status & UCBF_MATCHED) && (pdev->DiskMirror[1].status & UCBF_MATCHED) )
-                               break;;
+                               break;
 
                        if ( pdev->DiskMirror[0].status & UCBF_SURVIVOR )                               // is first drive survivor?
                                testsize = SetReconstruct (pdev, 0);
@@ -2613,7 +2613,7 @@ int Pci2220i_Detect (Scsi_Host_Template *tpnt)
        
                if ( ++Installed < MAXADAPTER )
                        continue;
-               break;;
+               break;
 unregister:;
                scsi_unregister (pshost);
                }
@@ -2747,7 +2747,7 @@ unregister:;
                
                if ( ++Installed < MAXADAPTER )
                        continue;
-               break;;
+               break;
 unregister1:;
                scsi_unregister (pshost);
                }
index e8c5ea8031a644b0aad340bf450f848f9a389e2a..ac97103b9f8b9a3bfa3cdb92be7dbe19599e6b8b 100644 (file)
@@ -501,7 +501,7 @@ struct Scsi_Host *__qlogicfas_detect(Scsi_Host_Template *host, int qbase,
                        release_region(qbase, 0x10);
                }
                if (qbase == 0x430)
-                       return NULL;;
+                       return NULL;
        } else
                printk(KERN_INFO "Ql: Using preset base address of %03x\n", qbase);
 
index a012737e337de6e7e53d8b183065653a9f0846e2..015fd8d5b1d1880b741f9c3755a8534358444131 100644 (file)
@@ -1778,7 +1778,7 @@ int isp2x00_reset(Scsi_Cmnd * Cmnd, unsigned int reset_flags)
 
        LEAVE("isp2x00_reset");
 
-       return return_status;;
+       return return_status;
 }
 
 
index 20e981215bd25a7fb54592f789ffce3ea00dce5b..ecce3a3d71e0e85fdce8565904a200796bce0625 100644 (file)
@@ -1230,7 +1230,7 @@ int isp1020_reset(Scsi_Cmnd *Cmnd, unsigned int reset_flags)
 
        LEAVE("isp1020_reset");
 
-       return return_status;;
+       return return_status;
 }
 
 
index af6bbf832cbcb9205b095f6c0aab2ed6b125f733..5f2fb7627a9deff10bdf760bc9be51468c8475f4 100644 (file)
@@ -1674,7 +1674,7 @@ dc390_DoingSRB_Done( PACB pACB, PSCSICMD cmd )
 #endif 
            psrb  = psrb2;
        }
-       pdcb->GoingSRBCnt = 0;;
+       pdcb->GoingSRBCnt = 0;
        pdcb->pGoingSRB = NULL;
        pdcb->TagMask = 0;
        pdcb = pdcb->pNextDCB;
index 183f4d88f078d0f530fec794a2eaa5871f4da2cc..19dba62ce6f9bb56a05fd5e072843b8a065ca6ee 100644 (file)
@@ -2056,7 +2056,7 @@ wd33c93_proc_info(struct Scsi_Host *instance, char *buf, char **start, off_t off
                return 0;
        }
        if (off > 0x40000)      /* ALWAYS stop after 256k bytes have been read */
-               stop = 1;;
+               stop = 1;
        if (hd->proc & PR_STOP) /* stop every other time */
                stop = 1;
        return strlen(bp);
index 88810cc91e58f7bcea57acf0f618e77977a69b91..455d99f39f52faa84a91168df58f0af726d43d08 100644 (file)
@@ -369,7 +369,7 @@ static void se401_video_irq(struct urb *urb, struct pt_regs *regs)
                                se401->scratch_overflow=0;
                                se401->scratch_next++;
                                if (se401->scratch_next>=SE401_NUMSCRATCH)
-                                       se401->scratch_next=0;;
+                                       se401->scratch_next=0;
                                break;
                        }
                }
index 04a752e9408fffc5064c7725e52a97ebb94a7197..10feeb7c1d63c51386802f0fcad46ac3cf8721b4 100644 (file)
@@ -641,7 +641,7 @@ static void stv680_video_irq (struct urb *urb, struct pt_regs *regs)
                        stv680->scratch_overflow = 0;
                        stv680->scratch_next++;
                        if (stv680->scratch_next >= STV680_NUMSCRATCH)
-                               stv680->scratch_next = 0;;
+                               stv680->scratch_next = 0;
                        break;
                }               /* switch  */
        } else {
index 69b798b77ce546a364b43c697d64123c7dc764d0..9af8f5ca9a5f00fc7d95c9d7426debdba86b5066 100644 (file)
@@ -155,7 +155,7 @@ static int          bytes_out;
 static int empeg_open (struct usb_serial_port *port, struct file *filp)
 {
        struct usb_serial *serial = port->serial;
-       int result = 0;;
+       int result = 0;
 
        if (port_paranoia_check (port, __FUNCTION__))
                return -ENODEV;
index 9a0bbdfedca9e4caf1227c5f8ea1cc31775586f6..b6f2053418a1bbda7d9b8eb80ef7ba5bdc1428d0 100644 (file)
@@ -511,7 +511,7 @@ static int mct_u232_write (struct usb_serial_port *port, int from_user,
 
        /* only do something if we have a bulk out endpoint */
        if (!serial->num_bulk_out)
-               return(0);;
+               return(0);
        
        /* another write is still pending? */
        if (port->write_urb->status == -EINPROGRESS) {
index 679ddae11bf259cdd1a5109bb590dc6458a77b64..e93e94c5c45ea3efa043980073541a88ce384b56 100644 (file)
@@ -640,21 +640,21 @@ static void radeon_fixup_panel_info(struct radeonfb_info *rinfo)
 #ifdef CONFIG_PPC_OF
        /* iBook2's */
        if (machine_is_compatible("PowerBook4,3")) {
-               rinfo->panel_info.ref_divider = rinfo->pll.ref_div;;
+               rinfo->panel_info.ref_divider = rinfo->pll.ref_div;
                rinfo->panel_info.post_divider = 0x6;
                rinfo->panel_info.fbk_divider = 0xad;
                rinfo->panel_info.use_bios_dividers = 1;
        }
        /* Aluminium PowerBook 17" */
        if (machine_is_compatible("PowerBook5,3")) {
-               rinfo->panel_info.ref_divider = rinfo->pll.ref_div;;
+               rinfo->panel_info.ref_divider = rinfo->pll.ref_div;
                rinfo->panel_info.post_divider = 0x4;
                rinfo->panel_info.fbk_divider = 0x80;
                rinfo->panel_info.use_bios_dividers = 1;
        }
        /* iBook G4 */
        if (machine_is_compatible("PowerBook6,3")) {
-               rinfo->panel_info.ref_divider = rinfo->pll.ref_div;;
+               rinfo->panel_info.ref_divider = rinfo->pll.ref_div;
                rinfo->panel_info.post_divider = 0x6;
                rinfo->panel_info.fbk_divider = 0xad;
                rinfo->panel_info.use_bios_dividers = 1;
index c6f6e9019dab0d1b428bdbbb4d0b056d156935e0..a28a66efb75f0d435d56aef5d86206f817e05fd8 100644 (file)
@@ -899,7 +899,7 @@ static u32 fb_get_hblank_by_hfreq(u32 hfreq, u32 xres)
  */
 static u32 fb_get_hblank_by_dclk(u32 dclk, u32 xres)
 {
-       u32 duty_cycle, h_period, hblank;;
+       u32 duty_cycle, h_period, hblank;
 
        dclk /= 1000;
        h_period = 100 - C_VAL;
index 451e1a4a90b63ba072be0e1e8fbdd249f8d2eecd..2633664b44a702cdf15df6fc2376f6ba6bdd119d 100644 (file)
@@ -281,7 +281,7 @@ static void i810_load_vgax(struct i810fb_par *par)
 static void i810_load_2d(struct i810fb_par *par)
 {
        u32 tmp;
-       u8 tmp8, *mmio = par->mmio_start_virtual;;
+       u8 tmp8, *mmio = par->mmio_start_virtual;
 
        i810_writel(FW_BLC, mmio, par->watermark); 
        tmp = i810_readl(PIXCONF, mmio);
index 02a12eb5ed7835dd9326f31135c43c0524a3986c..82a73bf2b6fa486e5f0a42014674750952ece567 100644 (file)
@@ -2313,7 +2313,7 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr, USHORT ModeNo, USHORT ModeIdIndex,
 
 #ifdef SIS315H
 
-        unsigned char bridgerev = SiS_GetReg(SiS_Pr->SiS_Part4Port,0x01);;
+        unsigned char bridgerev = SiS_GetReg(SiS_Pr->SiS_Part4Port,0x01);
 
        /* The following is nearly unpreditable and varies from machine
         * to machine. Especially the 301DH seems to be a real trouble
index 85b0f4a68c0d384ea0fcb268e743095437b48233..696150926ad0ebcc664aa1e43ca49e0a200dc268 100644 (file)
@@ -116,7 +116,7 @@ cifs_reconnect(struct TCP_Server_Info *server)
        if(server->ssocket) {
                cFYI(1,("State: 0x%x Flags: 0x%lx", server->ssocket->state,
                        server->ssocket->flags));
-               server->ssocket->ops->shutdown(server->ssocket,SEND_SHUTDOWN);;
+               server->ssocket->ops->shutdown(server->ssocket,SEND_SHUTDOWN);
                cFYI(1,("Post shutdown state: 0x%x Flags: 0x%lx", server->ssocket->state,
                        server->ssocket->flags));
                sock_release(server->ssocket);
index e065896c3db3839dc1849e22dc887205b749e091..59b22a5008323fb938a59c097115ec88ca530d2b 100644 (file)
@@ -57,7 +57,7 @@ static unsigned long presto_xfs_freespace(struct presto_file_set *fset,
         VFS_STATVFS(vfsp, &stat, NULL, rc);
         avail = statp.f_bfree;
 
-        return sbp->sb_fdblocks;
+        return sbp->sb_fdblocks;
 #endif
         return 0x0fffffff;
 }
index 4c5fa12c8bd8a6478ec0686adbf51123ab043a45..74d6a3e27491828498bddacda514eb784d47e7f6 100644 (file)
@@ -350,7 +350,7 @@ smb_receive(struct smb_sb_info *server, struct smb_request *req)
        fs = get_fs();
        set_fs(get_ds());
 
-       flags = MSG_DONTWAIT | MSG_NOSIGNAL;;
+       flags = MSG_DONTWAIT | MSG_NOSIGNAL;
        msg.msg_flags = flags;
        msg.msg_name = NULL;
        msg.msg_namelen = 0;
index 77664a9f6a643095a2b7a3264d3f65a22c08f666..a5686ae5dc727722e5099746abdf9355761e31e9 100644 (file)
@@ -170,7 +170,7 @@ __set_personality(u_long personality)
                fsp = copy_fs_struct(current->fs);
                if (fsp == NULL) {
                        module_put(ep->module);
-                       return -ENOMEM;;
+                       return -ENOMEM;
                }
 
                task_lock(current);
@@ -213,7 +213,7 @@ get_exec_domain_list(char *page)
 asmlinkage long
 sys_personality(u_long personality)
 {
-       u_long old = current->personality;;
+       u_long old = current->personality;
 
        if (personality != 0xffffffff) {
                set_personality(personality);
index 4377231e98e3e32d2aad3a419c272c22bea8ccab..6793ac0029151ab3b0bfb8a3df7014cf79d06b0f 100644 (file)
@@ -47,7 +47,7 @@ EXPORT_SYMBOL(bitmap_full);
 int bitmap_equal(const unsigned long *bitmap1,
                unsigned long *bitmap2, int bits)
 {
-       int k, lim = bits/BITS_PER_LONG;;
+       int k, lim = bits/BITS_PER_LONG;
        for (k = 0; k < lim; ++k)
                if (bitmap1[k] != bitmap2[k])
                        return 0;
index acf84929028053d0882f150e555482b38400e467..00b4effb65f68fbb14855db306b51f970aa9dcc3 100644 (file)
@@ -899,10 +899,10 @@ static unsigned char snmp_trap_decode(struct asn1_ctx *ctx,
                goto err_addr_free;
                
        if (cls != ASN1_UNI || con != ASN1_PRI || tag != ASN1_INT)
-               goto err_addr_free;;
+               goto err_addr_free;
                
        if (!asn1_uint_decode(ctx, end, &trap->general))
-               goto err_addr_free;;
+               goto err_addr_free;
                
        if (!asn1_header_decode(ctx, &end, &cls, &con, &tag))
                goto err_addr_free;
index 54ca870f17fa1509d545fe19266d2d4cbed2a63a..ab019a9b8eb61b0fd2def76a3acfa2b480cef09d 100644 (file)
@@ -1596,7 +1596,7 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
        newinet->id = newtp->write_seq ^ jiffies;
 
        tcp_sync_mss(newsk, dst_pmtu(dst));
-       newtp->advmss = dst_metric(dst, RTAX_ADVMSS);;
+       newtp->advmss = dst_metric(dst, RTAX_ADVMSS);
        tcp_initialize_rcv_mss(newsk);
 
        __tcp_v4_hash(newsk, 0);
index 87e4601231f6785f0085609ee057a7584c5fc3a6..df7d38f8b88a13be005be10fa699ce98cbb33c6e 100644 (file)
@@ -53,7 +53,7 @@ void handle_filter_request(struct irlan_cb *self, struct sk_buff *skb)
                        self->provider.mac_address[4] = 
                                self->provider.send_arb_val & 0xff;
                        self->provider.mac_address[5] = 
-                               (self->provider.send_arb_val >> 8) & 0xff;;
+                               (self->provider.send_arb_val >> 8) & 0xff;
                } else {
                        /* Just generate something for now */
                        get_random_bytes(self->provider.mac_address+4, 1);
index a902c49f5dac02067788da56b002c32a68129131..093c362e00299bdd17a9094a3445427d55567dee 100644 (file)
@@ -1271,7 +1271,7 @@ void irttp_connect_indication(void *instance, void *sap, struct qos_info *qos,
 
        lsap = (struct lsap_cb *) sap;
 
-       self->max_seg_size = max_seg_size - TTP_HEADER;;
+       self->max_seg_size = max_seg_size - TTP_HEADER;
        self->max_header_size = max_header_size+TTP_HEADER;
 
        IRDA_DEBUG(4, "%s(), TSAP sel=%02x\n", __FUNCTION__, self->stsap_sel);
index c880458268b28f19374b8e962826805d13f0172e..f0c71d6b0fd7a2f58721a22f4f9912cc9d70690c 100644 (file)
@@ -1699,7 +1699,7 @@ static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, i
                sin6->sin6_port = xp->selector.sport;
                sin6->sin6_flowinfo = 0;
                memcpy(&sin6->sin6_addr, xp->selector.saddr.a6,
-                      sizeof(struct in6_addr));;
+                      sizeof(struct in6_addr));
                sin6->sin6_scope_id = 0;
        }
 #endif
index 46073c3f04bf81599fd7f6392fe5298cbee995ae..151c841e634bef5919c379b9a80c782a32b4d4e9 100644 (file)
@@ -1562,7 +1562,7 @@ hfsc_change_qdisc(struct Qdisc *sch, struct rtattr *opt)
        struct tc_hfsc_qopt *qopt;
 
        if (opt == NULL || RTA_PAYLOAD(opt) < sizeof(*qopt))
-               return -EINVAL;;
+               return -EINVAL;
        qopt = RTA_DATA(opt);
 
        sch_tree_lock(sch);
index 38c293f737f04c1cd49ecc4da71208b81a7d7c30..b484b4afd7301eded651f956d194d0dded4fe38a 100644 (file)
@@ -292,7 +292,7 @@ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw_addr_list,
                if (retval) {
                        /* Can't finish building the list, clean up. */
                        sctp_bind_addr_clean(bp);
-                       break;;
+                       break;
                }
 
                len = ntohs(param->length);
index d8d22ed083bee1db084748cf237823cee6e1437b..d32ba355937f2e83da3e163c4f0ec8b90ff024d4 100644 (file)
@@ -1467,7 +1467,7 @@ malformed:
 struct __sctp_missing {
        __u32 num_missing;
        __u16 type;
-}  __attribute__((packed));;
+}  __attribute__((packed));
 
 /*
  * Report a missing mandatory parameter.
index 8062d2a984afe74631ac5dfaeef36b2c8d4c605b..f5a87efe14a91fdb9e70260b6bbefd0ac0f53bfa 100644 (file)
@@ -4490,7 +4490,7 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
         * 3) Peeling off non-partial delivery; move pd_lobby to recieve_queue.
         */
        skb_queue_head_init(&newsp->pd_lobby);
-       sctp_sk(newsk)->pd_mode = assoc->ulpq.pd_mode;;
+       sctp_sk(newsk)->pd_mode = assoc->ulpq.pd_mode;
 
        if (sctp_sk(oldsk)->pd_mode) {
                struct sk_buff_head *queue;
index a7c96554e552df9f14c89f1f38402395abeda5a5..430b077c31ad6f38fdf8aa672170fb77a58149b3 100644 (file)
@@ -193,7 +193,7 @@ static int rsi_parse(struct cache_detail *cd,
        len = qword_get(&mesg, buf, mlen);
        status = -EINVAL;
        if (len < 0)
-               goto out;;
+               goto out;
        status = -ENOMEM;
        if (dup_to_netobj(&rsii.in_token, buf, len))
                goto out;
index b42eaa71fcc6c11b011b1d2157fb553ca3b0389f..0c72dd49215f1c37d634057e010fdea7f16ecf85 100644 (file)
@@ -1453,7 +1453,7 @@ static int selinux_quotactl(int cmds, int type, int id, struct super_block *sb)
 
 static int selinux_quota_on(struct file *f)
 {
-       return file_has_perm(current, f, FILE__QUOTAON);;
+       return file_has_perm(current, f, FILE__QUOTAON);
 }
 
 static int selinux_syslog(int type)
index 110a6d3686488539d3f32267ca168839cc175bba..c50e45e583d6dc12f42fd55173fa35ffd8ac4448 100644 (file)
@@ -3253,7 +3253,7 @@ static int cs_open(struct inode *inode, struct file *file)
                        
                if (dmabuf->channel == NULL) {
                        kfree (card->states[0]);
-                       card->states[0] = NULL;;
+                       card->states[0] = NULL;
                        return -ENODEV;
                }
 
@@ -3324,7 +3324,7 @@ static int cs_open(struct inode *inode, struct file *file)
                        
                if (dmabuf->channel == NULL) {
                        kfree (card->states[1]);
-                       card->states[1] = NULL;;
+                       card->states[1] = NULL;
                        return -ENODEV;
                }
 
index 259d556af9ed52891b48915ee309668964d0857c..cb693b05c095f3604462946f7e3b462e3c4e3812 100644 (file)
@@ -2471,7 +2471,7 @@ found_virt:
        if(file->f_mode & FMODE_READ) {
                if((dmabuf->read_channel = card->alloc_rec_pcm_channel(card)) == NULL) {
                        kfree (card->states[i]);
-                       card->states[i] = NULL;;
+                       card->states[i] = NULL;
                        return -EBUSY;
                }
                dmabuf->trigger |= PCM_ENABLE_INPUT;
@@ -2483,7 +2483,7 @@ found_virt:
                        if(file->f_mode & FMODE_READ)
                                card->free_pcm_channel(card,dmabuf->read_channel->num);
                        kfree (card->states[i]);
-                       card->states[i] = NULL;;
+                       card->states[i] = NULL;
                        return -EBUSY;
                }
                /* Initialize to 8kHz?  What if we don't support 8kHz? */
index 7c7af9527714c106a5e20c2e1de08d143f192371..7ac7126664a7cfa9b0b7aebd0b02bb6f50da2654 100644 (file)
@@ -293,7 +293,7 @@ static u16 rdcodec(struct ac97_codec *codec, u8 addr)
 
        spin_unlock_irqrestore(&s->lock, flags);
 
-       return result & 0xffff;;
+       return result & 0xffff;
 }
 
 
index 5195a535b5de3b219f1952d04982ef220222a30d..ddd08b7054ec4444f037653cf02fece5ad789aba 100644 (file)
@@ -1320,7 +1320,7 @@ static int rme96xx_ioctl(struct inode *in, struct file *file, unsigned int cmd,
                count = rme96xx_getispace(dma,val);
 
                abinfo.fragsize = (s->fragsize*dma->inchannels)>>dma->formatshift;
-                abinfo.bytes = (count*dma->inchannels)>>dma->formatshift;;
+                abinfo.bytes = (count*dma->inchannels)>>dma->formatshift;
                 abinfo.fragstotal = 2;
                 abinfo.fragments = count > s->fragsize; 
                return copy_to_user((void *)arg, &abinfo, sizeof(abinfo)) ? -EFAULT : 0;
@@ -1348,7 +1348,7 @@ static int rme96xx_ioctl(struct inode *in, struct file *file, unsigned int cmd,
                        return -EINVAL;
                val = rme96xx_gethwptr(dma->s,0);
                spin_lock_irqsave(&s->lock,flags);
-                cinfo.bytes = s->fragsize<<1;;
+                cinfo.bytes = s->fragsize<<1;
                count = val - dma->readptr;
                if (count < 0)
                        count += s->fragsize<<1;
@@ -1368,7 +1368,7 @@ static int rme96xx_ioctl(struct inode *in, struct file *file, unsigned int cmd,
                        return -EINVAL;
                val = rme96xx_gethwptr(dma->s,0);
                spin_lock_irqsave(&s->lock,flags);
-                cinfo.bytes = s->fragsize<<1;;
+                cinfo.bytes = s->fragsize<<1;
                count = val - dma->writeptr;
                if (count < 0)
                        count += s->fragsize<<1;
index ddc9e4448c33def5e18599cbf2bafdb07d3203c7..ee1f493caba4e6078aea4df8613bb892e54e8ec9 100644 (file)
@@ -706,7 +706,7 @@ void request_sound_timer(int count)
 
 void sound_stop_timer(void)
 {
-       del_timer(&seq_timer);;
+       del_timer(&seq_timer);
 }
 
 void conf_printf(char *name, struct address_info *hw_config)
index 5bbffa52556c1a40ad314505f4f2e6e6e38f6c7e..459c1741a9deb94cefbe660884bf3f73c10362ef 100644 (file)
@@ -116,7 +116,7 @@ static void
 def_tmr_close(int dev)
 {
        opened = tmr_running = 0;
-       del_timer(&def_tmr);;
+       del_timer(&def_tmr);
 }
 
 static int
index 57cbda432476983fa07f668cadd68278e84ddd1f..cb21fa4755424f36182897169ca3769588e1e264 100644 (file)
@@ -544,7 +544,7 @@ static int snd_card_harmony_capture_trigger(snd_pcm_substream_t * substream,
                case SNDRV_PCM_TRIGGER_STOP:
                        if (harmony->cap_stopped) 
                                return -EBUSY;
-                       harmony->cap_stopped = 1;;
+                       harmony->cap_stopped = 1;
                        snd_harmony_disable_interrupts(harmony);
                        break;
                case SNDRV_PCM_TRIGGER_START:
index 5c2bb32759161b20849211db193cefcba60e7b55..186721869f580ddb410c073c817d23d88fbb5d9b 100644 (file)
@@ -155,7 +155,7 @@ static int vortex_wt_GetReg(vortex_t * vortex, char reg, int wt)
                return hwread(vortex->mmio, WT_PARM(wt, 3));
        }
        if (reg == 7) {
-               return hwread(vortex->mmio, WT_GMODE(wt));;
+               return hwread(vortex->mmio, WT_GMODE(wt));
        }
 
        return 0;
index e2092c13bc7ac679f3a13367e213ebe67c0e1dad..95fc96f9fbb60b6b89b337ccefb246d7c1f4b73d 100644 (file)
@@ -823,7 +823,7 @@ int cs46xx_dsp_proc_init (snd_card_t * card, cs46xx_t *chip)
                entry->private_data = chip;
                entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
                entry->c.text.read_size = 512;
-               entry->c.text.read = cs46xx_dsp_proc_task_tree_read;;
+               entry->c.text.read = cs46xx_dsp_proc_task_tree_read;
                if (snd_info_register(entry) < 0) {
                        snd_info_free_entry(entry);
                        entry = NULL;
@@ -836,7 +836,7 @@ int cs46xx_dsp_proc_init (snd_card_t * card, cs46xx_t *chip)
                entry->private_data = chip;
                entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
                entry->c.text.read_size = 1024;
-               entry->c.text.read = cs46xx_dsp_proc_scb_read;;
+               entry->c.text.read = cs46xx_dsp_proc_scb_read;
                if (snd_info_register(entry) < 0) {
                        snd_info_free_entry(entry);
                        entry = NULL;