[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>

diff --git a/arch/arm/mach-pxa/leds-mainstone.c b/arch/arm/mach-pxa/leds-mainstone.c
index bbd3f87a9fc2222e176e4fddd4e61080b965086e..c06d3d7a8dd4923da3f3989b25de5b0bf13676d8 100644 (file)
--- a/arch/arm/mach-pxa/leds-mainstone.c
+++ b/arch/arm/mach-pxa/leds-mainstone.c
@@ -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:

diff --git a/arch/arm/mach-s3c2410/cpu.c b/arch/arm/mach-s3c2410/cpu.c
index 00a379334b60b2d325da1a8614a4c3e69e38ebaf..70c34fcf78586c6cba26ca01675078a64baf0ea3 100644 (file)
--- a/arch/arm/mach-s3c2410/cpu.c
+++ b/arch/arm/mach-s3c2410/cpu.c
@@ -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);

diff --git a/arch/frv/kernel/gdb-stub.c b/arch/frv/kernel/gdb-stub.c
index 8f860d9c494736faa1c2d38511d4e152dbc31aa3..508601fad0791749933b5da42864d746e1984971 100644 (file)
--- a/arch/frv/kernel/gdb-stub.c
+++ b/arch/frv/kernel/gdb-stub.c
@@ -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);

diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c
index 1f11db470d90e97d76cc07c3f8321ad617a47783..e952ef4f6d912dd361b7360d5a87df78f0f00f09 100644 (file)
--- a/arch/ia64/sn/kernel/bte.c
+++ b/arch/ia64/sn/kernel/bte.c
@@ -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];

diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index 7571a402552925dccb1219fdcb0736fc38c779c0..be0176912968f93c9ed842ffce9604fbb5b1d678 100644 (file)
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -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;

diff --git a/arch/mips/mm/dma-ip32.c b/arch/mips/mm/dma-ip32.c
index a7e3072ff78d5b7570d394c6eac2bd0521b498dc..ec54ed0d26ff23fbf257e6e6193cf9a8eeb06815 100644 (file)
--- a/arch/mips/mm/dma-ip32.c
+++ b/arch/mips/mm/dma-ip32.c
@@ -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;
 

diff --git a/arch/ppc/syslib/ppc85xx_setup.c b/arch/ppc/syslib/ppc85xx_setup.c
index e70b34ee627519b977eb8a671a84d071843eb6c2..79b7089d7500a5127af9173ab72e6f50b5b76057 100644 (file)
--- a/arch/ppc/syslib/ppc85xx_setup.c
+++ b/arch/ppc/syslib/ppc85xx_setup.c
@@ -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 */

diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index e505a4125e35dba3f482b4176a621f2e3dd6d3a0..11e645c9ec508e97b10a898b908c9bab75073f4f 100644 (file)
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -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;

diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 8a8ca32822ba4ee800c076ebef798477ce25df5b..e6b714b6390df158966a88a71dae92f09c318302 100644 (file)
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -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)

diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index ede688a4e141ad71834fb90930d83b7466751caa..d68be61f0a49a6372f7aa438752d4f7c4eccbf28 100644 (file)
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -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)

diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index b046390cd256cd92b166878f362868e421d986be..738ec2f4e563d4a1c0bafc77356487113d7b9a5a 100644 (file)
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -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)

diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index 960adb256fbb67f3e0e64cfca4a5d9a162169329..8587401311155dd5abcb9e0bde00ed6e8a3493c2 100644 (file)
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -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)

diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index 47b4d49f75c6a3393136fd50e9eecaf429bb33b9..14e810f3c2c09db43ab6687efbfaa8076c65fc5c 100644 (file)
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -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;

diff --git a/drivers/i2c/chips/rtc8564.c b/drivers/i2c/chips/rtc8564.c
index ceaa6b0bdfd6eeeff7d94a7426b92352f5e32d24..0d8699b3f488cd9e819bf8c19cb4eb3b635667e5 100644 (file)
--- a/drivers/i2c/chips/rtc8564.c
+++ b/drivers/i2c/chips/rtc8564.c
@@ -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;

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 0523da77425aa35ceb5905636e9a8b839bf887f4..c481be8b807f6fe9345ce20bdfd0da16d8eaeee2 100644 (file)
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -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);

diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index a5f2b1ee0752e27ee9c3225b9817eb17a26d1acc..38a26df4095f33976dc05bca3b405fe3cf9c64dc 100644 (file)
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -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? 

diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 2838f661b39395381b64df5788ebb5a2419fb01d..62532b4e45c5ea53abf9b308a56365063c0fe74b 100644 (file)
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -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 */

diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c
index eea2f04c8c6d4149b7a85b50f5f5390358eb8d66..ebb238785839773abc118b3e9fa556cdc9f36df5 100644 (file)
--- a/drivers/net/wireless/prism54/oid_mgt.c
+++ b/drivers/net/wireless/prism54/oid_mgt.c
@@ -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:

diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c
index fee4be1ce810af9528ee1ad802513504d10005c9..5fa6fbe35bb9406bb323afcf4be515faed133836 100644 (file)
--- a/drivers/net/wireless/spectrum_cs.c
+++ b/drivers/net/wireless/spectrum_cs.c
@@ -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 */

diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index bf9f7f7ba354862467c11ca54fc40775056b4af9..c11e5ce6865e71c18ca6d14fd584b325ffbb1919 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -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();

diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 28538db9eaf3920eb5e565058882c069ecf6ddde..2a0e18a48748597fdd43d37788cdafaa2589ccce 100644 (file)
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -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;

diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 58b59f6e988195817db2ff076cd2e517362de53a..d4bf1701046bbaa5543f216eeaf36c616a607fd6 100644 (file)
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -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);

diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 1f8d805c61e58840e7d31ea1a4a5509571a5b245..5886a2f1323eb573349fc017726369910947261f 100644 (file)
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -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);

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index b41e8b379652b228377f01d1d20bfaa47c3883e8..a243fe2792d5ed34824f56e8a0a3205d36e48ab5 100644 (file)
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -4908,7 +4908,7 @@ SetEARetry:
        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);

diff --git a/fs/pnode.c b/fs/pnode.c
index f1871f773f642c8f39045431f5e42134e93ea80f..37b568ed0e05d14407afd4464ea114e307d158a4 100644 (file)
--- a/fs/pnode.c
+++ b/fs/pnode.c
@@ -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;

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index e496fac860ac117e9f7c2bf41f3ef5595c718b3e..6dca3d542080a36e7ec745387f43aa5f98a71289 100644 (file)
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -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;

diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h
index e77f0c9b7d3df2145908c1e76c58d9771f9154ef..b546de2fdce5902d7509f5d4cd9529f2588ec70a 100644 (file)
--- a/include/asm-ia64/sn/sn_sal.h
+++ b/include/asm-ia64/sn/sn_sal.h
@@ -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;

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 33228115cda43725481b4882a060f84b445b776b..ef7366fc132f6e7e6eab1c93fa3097749cbd9372 100644 (file)
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -315,7 +315,7 @@ ok:
                spin_unlock(&head->lock);
 
                if (tw) {
-                       inet_twsk_deschedule(tw, death_row);;
+                       inet_twsk_deschedule(tw, death_row);
                        inet_twsk_put(tw);
                }
 

diff --git a/net/ipv4/netfilter/ip_nat_standalone.c b/net/ipv4/netfilter/ip_nat_standalone.c
index ab1f88fa21ecd24f6e5738d42d6397e17bd4f499..380aef3d7865c03e781023e501b41599a9d6125d 100644 (file)
--- a/net/ipv4/netfilter/ip_nat_standalone.c
+++ b/net/ipv4/netfilter/ip_nat_standalone.c
@@ -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) {

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 910b37e5083db64c4b544dcaf368b97fe761b012..784b24b6d102bca6d74a07473ed03692fd9bc820 100644 (file)
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -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;
                                 }

diff --git a/sound/ppc/toonie.c b/sound/ppc/toonie.c
index 210be20dc27e41fa1bbdedb225462e1ac0702c40..4e595172e42387d6bffee7593048cdd61e200c73 100644 (file)
--- a/sound/ppc/toonie.c
+++ b/sound/ppc/toonie.c
@@ -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]) {