drivers/net: remove useless semicolons
authorJoe Perches <joe@perches.com>
Tue, 18 May 2010 05:47:34 +0000 (22:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 May 2010 05:47:34 +0000 (22:47 -0700)
switch and while statements don't need semicolons at end of statement

[ Fixup minor conflicts with recent wimax merge... -DaveM ]

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
23 files changed:
drivers/net/cassini.c
drivers/net/ehea/ehea_main.c
drivers/net/eql.c
drivers/net/irda/via-ircc.h
drivers/net/jme.c
drivers/net/lib82596.c
drivers/net/mlx4/eq.c
drivers/net/myri_sbus.c
drivers/net/pppoe.c
drivers/net/ps3_gelic_wireless.c
drivers/net/skfp/smt.c
drivers/net/slip.c
drivers/net/sunbmac.c
drivers/net/sunhme.c
drivers/net/sunlance.c
drivers/net/tun.c
drivers/net/wimax/i2400m/control.c
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/hostap/hostap_ap.c
drivers/net/wireless/hostap/hostap_download.c
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
drivers/net/wireless/prism54/islpci_dev.c
drivers/net/wireless/rt2x00/rt2x00firmware.c

index 6d76236ea069f1640e44c6028631222036f65c3a..04a03f7003a0d9e0e0d2bf0d852c90f253fcaa56 100644 (file)
@@ -4824,7 +4824,7 @@ static int cas_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                break;
        default:
                break;
-       };
+       }
 
        mutex_unlock(&cp->pm_mutex);
        return rc;
index e8a8ccfedac638c65ccd187c39272a75f9967cf7..02698a1c80b057a4f57eba4e5e72f40c2c7da293 100644 (file)
@@ -820,7 +820,7 @@ static struct ehea_cqe *ehea_proc_cqes(struct ehea_port_res *pr, int my_quota)
                quota--;
 
                cqe = ehea_poll_cq(send_cq);
-       };
+       }
 
        ehea_update_feca(send_cq, cqe_counter);
        atomic_add(swqe_av, &pr->swqe_avail);
@@ -3253,7 +3253,7 @@ static int ehea_setup_ports(struct ehea_adapter *adapter)
                        ehea_remove_adapter_mr(adapter);
 
                i++;
-       };
+       }
        return 0;
 }
 
@@ -3272,7 +3272,7 @@ static struct device_node *ehea_get_eth_dn(struct ehea_adapter *adapter,
                if (dn_log_port_id)
                        if (*dn_log_port_id == logical_port_id)
                                return eth_dn;
-       };
+       }
 
        return NULL;
 }
index b34a2ddeef4c810b37dca41faad2ed4cc12955b9..dda2c7944da9a45872d55f626503d15c67c67641 100644 (file)
@@ -288,7 +288,7 @@ static int eql_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                        return eql_s_master_cfg(dev, ifr->ifr_data);
                default:
                        return -EOPNOTSUPP;
-       };
+       }
 }
 
 /* queue->lock must be held */
index d9d1db03fa2d97638824ddf35e792350b484e326..5a84822b5a43ed0dcefc9622723753490d961733 100644 (file)
@@ -774,7 +774,7 @@ static void SetBaudRate(__u16 iobase, __u32 rate)
                        break;
                default:
                        break;
-               };
+               }
        } else if (IsMIROn(iobase)) {
                value = 0;      // will automatically be fixed in 1.152M
        } else if (IsFIROn(iobase)) {
index 4a090650b5aad14cc253734ba9c046f33d27928c..99f24f5cac53f6c6a70e25681253593b3b485a6e 100644 (file)
@@ -2835,7 +2835,7 @@ jme_init_one(struct pci_dev *pdev,
        default:
                jme->reg_txcs = TXCS_DEFAULT | TXCS_DMASIZE_512B;
                break;
-       };
+       }
 
        /*
         * Must check before reset_mac_processor
index de856d8abc90fab268b2301c176906e63788ce59..ce5d6e9092182a43d2f0660e68667edf44bfae3b 100644 (file)
@@ -1091,7 +1091,7 @@ static int __devinit i82596_probe(struct net_device *dev)
                DMA_FREE(dev->dev.parent, sizeof(struct i596_dma),
                                    (void *)dma, lp->dma_addr);
                return i;
-       };
+       }
 
        DEB(DEB_PROBE, printk(KERN_INFO "%s: 82596 at %#3lx, %pM IRQ %d.\n",
                              dev->name, dev->base_addr, dev->dev_addr,
index 7365bf488b81a6a1572971da726b7f9662f042e6..423053482ed51c3991495b1dab8771ef45c03231 100644 (file)
@@ -239,7 +239,7 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq)
                        mlx4_warn(dev, "Unhandled event %02x(%02x) on EQ %d at index %u\n",
                                  eqe->type, eqe->subtype, eq->eqn, eq->cons_index);
                        break;
-               };
+               }
 
                ++eq->cons_index;
                eqes_found = 1;
index b72e749afdf102d5bb690be5e29617044a927a75..3898108f98ce6c7d6bd096a868080def27501223 100644 (file)
@@ -865,7 +865,7 @@ static inline void determine_reg_space_size(struct myri_eth *mp)
                printk("myricom: AIEEE weird cpu version %04x assuming pre4.0\n",
                       mp->eeprom.cpuvers);
                mp->reg_size = (3 * 128 * 1024) + 4096;
-       };
+       }
 }
 
 #ifdef DEBUG_DETECT
index 99f031a08a015942609eebd6a7dc897d77dcc00a..03fd5821d9a1500927e29df02f919518bd16dbe9 100644 (file)
@@ -362,7 +362,7 @@ static int pppoe_device_event(struct notifier_block *this,
 
        default:
                break;
-       };
+       }
 
        return NOTIFY_DONE;
 }
index a7bc406658e17a6d96eb3edf0ff406af83c7767d..27f5d6f7ade69d735e2ca43438b77ebeffd3540b 100644 (file)
@@ -896,7 +896,7 @@ static int gelic_wl_set_auth(struct net_device *netdev,
        default:
                ret = -EOPNOTSUPP;
                break;
-       };
+       }
 
        if (!ret)
                set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat);
@@ -1991,7 +1991,7 @@ static int gelic_wl_associate_bss(struct gelic_wl_info *wl,
        case GELIC_WL_WPA_LEVEL_WPA2:
                ret = gelic_wl_do_wpa_setup(wl);
                break;
-       };
+       }
 
        if (ret) {
                pr_debug("%s: WEP/WPA setup failed %d\n", __func__,
index 83d16fecfac4280608099dbb3747707f76000d54..6f35bb77595f2ffab9cdb939f75a95efb8d0a27b 100644 (file)
@@ -574,7 +574,7 @@ void smt_received_pack(struct s_smc *smc, SMbuf *mb, int fs)
                if (smt_check_para(smc,sm,plist_nif)) {
                        DB_SMT("SMT: NIF with para problem, ignoring\n",0,0) ;
                        break ;
-               } ;
+               }
                switch (sm->smt_type) {
                case SMT_ANNOUNCE :
                case SMT_REQUEST :
index d92772e992d2fea565a1f42f7fd49750c03e0c6d..fa434fb8fb7c087df16bacaf9108dfa3646e35db 100644 (file)
@@ -1269,7 +1269,7 @@ static int sl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
        case SIOCGLEASE:
                *p = sl->leased;
-       };
+       }
        spin_unlock_bh(&sl->lock);
        return 0;
 }
index 34446b6d9a3c1b6535722283c2118087c56f412d..4591fe9bf0b9dd5fe875f5e6aecc5f877b0cc119 100644 (file)
@@ -362,7 +362,7 @@ static void bigmac_tcvr_write(struct bigmac *bp, void __iomem *tregs,
        default:
                printk(KERN_ERR "bigmac_tcvr_read: Whoops, no known transceiver type.\n");
                return;
-       };
+       }
 
        idle_transceiver(tregs);
        write_tcvr_bit(bp, tregs, 0);
@@ -401,7 +401,7 @@ static unsigned short bigmac_tcvr_read(struct bigmac *bp,
        default:
                printk(KERN_ERR "bigmac_tcvr_read: Whoops, no known transceiver type.\n");
                return 0xffff;
-       };
+       }
 
        idle_transceiver(tregs);
        write_tcvr_bit(bp, tregs, 0);
index 30826eba1a534e0c1e2840103e17587f2e711fce..915c5909c7a8bb90e4c6fe22617f5dbee032552c 100644 (file)
@@ -855,7 +855,7 @@ static void happy_meal_timer(unsigned long data)
                hp->timer_ticks = 0;
                hp->timer_state = asleep; /* foo on you */
                break;
-       };
+       }
 
        if (restart_timer) {
                hp->happy_timer.expires = jiffies + ((12 * HZ)/10); /* 1.2 sec. */
@@ -1488,7 +1488,7 @@ static int happy_meal_init(struct happy_meal *hp)
                HMD(("external, disable MII, "));
                hme_write32(hp, bregs + BMAC_XIFCFG, BIGMAC_XCFG_MIIDISAB);
                break;
-       };
+       }
 
        if (happy_meal_tcvr_reset(hp, tregs))
                return -EAGAIN;
@@ -1734,7 +1734,7 @@ static void happy_meal_set_initial_advertisement(struct happy_meal *hp)
        case external:
                hme_write32(hp, bregs + BMAC_XIFCFG, BIGMAC_XCFG_MIIDISAB);
                break;
-       };
+       }
        if (happy_meal_tcvr_reset(hp, tregs))
                return;
 
index f88a60fa25f8f9328bd467f51ccf40609c4a9ca7..386af7bbe6783914f3fd683bc12d28a84b770e1a 100644 (file)
@@ -1054,7 +1054,7 @@ static void lance_piocopy_from_skb(void __iomem *dest, unsigned char *src, int l
                }
                src = (char *) p16;
                break;
-       };
+       }
        if (len >= 2) {
                u16 val = src[0] << 8 | src[1];
                sbus_writew(val, piobuf);
index 01b5cfcfa870f97942543b2aaab6ab10f77e7d5e..97b25533e5fb1dd741bc7a2541ed598014707a99 100644 (file)
@@ -1367,7 +1367,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
        default:
                ret = -EINVAL;
                break;
-       };
+       }
 
 unlock:
        rtnl_unlock();
index ac5e2c4e517c97a35e8c5b94e15f482bb2c282ea..d86e8f31e7fcfc8b0b3bc1e1a46cc6f35cb8bfdb 100644 (file)
@@ -361,7 +361,7 @@ void i2400m_report_tlv_system_state(struct i2400m *i2400m,
                        i2400m_state);
                i2400m_reset(i2400m, I2400M_RT_WARM);
                break;
-       };
+       }
        d_fnend(3, dev, "(i2400m %p ss %p [%u]) = void\n",
                i2400m, ss, i2400m_state);
 }
@@ -410,7 +410,7 @@ void i2400m_report_tlv_media_status(struct i2400m *i2400m,
        default:
                dev_err(dev, "HW BUG? unknown media status %u\n",
                        status);
-       };
+       }
        d_fnend(3, dev, "(i2400m %p ms %p [%u]) = void\n",
                i2400m, ms, status);
 }
@@ -539,7 +539,7 @@ void i2400m_report_hook(struct i2400m *i2400m,
                        }
                }
                break;
-       };
+       }
        d_fnend(3, dev, "(i2400m %p l3l4_hdr %p size %zu) = void\n",
                i2400m, l3l4_hdr, size);
 }
@@ -582,7 +582,7 @@ void i2400m_msg_ack_hook(struct i2400m *i2400m,
                                         size);
                }
                break;
-       };
+       }
 }
 
 
@@ -754,7 +754,7 @@ struct sk_buff *i2400m_msg_to_dev(struct i2400m *i2400m,
                break;
        default:
                ack_timeout = HZ;
-       };
+       }
 
        if (unlikely(i2400m->trace_msg_from_user))
                wimax_msg(&i2400m->wimax_dev, "echo", buf, buf_len, GFP_KERNEL);
index 8c795488ebc307076f62ad4b47472aee4a4c2de8..d457cb3bd7720af182d929599f38e5d46fcac2d8 100644 (file)
@@ -308,7 +308,7 @@ int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
                        dd->dd_desc_len += dma_len;
 
                        ndesc_skipped = ATH_DESC_4KB_BOUND_NUM_SKIPPED(dma_len);
-               };
+               }
        }
 
        /* allocate descriptors */
index 7e72ac1de49b96b4abb8672240e26d3c3f121eb4..231dbd77f5f5b31669116799ceeab36467b79963 100644 (file)
@@ -349,7 +349,7 @@ static int ap_control_proc_read(char *page, char **start, off_t off,
        default:
                policy_txt = "unknown";
                break;
-       };
+       }
        p += sprintf(p, "MAC policy: %s\n", policy_txt);
        p += sprintf(p, "MAC entries: %u\n", ap->mac_restrictions.entries);
        p += sprintf(p, "MAC list:\n");
index 89d3849abfe002f67a53ea2ea4111625f7e6358e..e73bf739fd9bd56871c7b6ef902c3622ba71c003 100644 (file)
@@ -744,7 +744,7 @@ static int prism2_download(local_info_t *local,
                       local->dev->name, param->dl_cmd);
                ret = -EINVAL;
                break;
-       };
+       }
 
  out:
        if (ret == 0 && dl &&
index 637d7b62fb5667dd84715094873d772389bd090f..1004cfc403b1a3d8316243a58cd16dcc273f93ee 100644 (file)
@@ -932,7 +932,7 @@ static u32 iwlagn_translate_rx_status(struct iwl_priv *priv, u32 decrypt_in)
                else
                        decrypt_out |= RX_RES_STATUS_DECRYPT_OK;
                break;
-       };
+       }
 
        IWL_DEBUG_RX(priv, "decrypt_in:0x%x  decrypt_out = 0x%x\n",
                                        decrypt_in, decrypt_out);
index 10d91afefa331724bd5f6d81375a24b7a2aaec1f..2c8cc954d1b6d85092f4d4f999ab1a8151e79ddb 100644 (file)
@@ -946,7 +946,7 @@ islpci_set_state(islpci_private *priv, islpci_state_t new_state)
                if (!priv->state_off)
                        priv->state = new_state;
                break;
-       };
+       }
 #if 0
        printk(KERN_DEBUG "%s: state transition %d -> %d (off#%d)\n",
               priv->ndev->name, old_state, new_state, priv->state_off);
index 34beb00c4347a8d8f032ad6191762945331eefca..b818a43c4672733792295f2dec5163137e860ce4 100644 (file)
@@ -79,7 +79,7 @@ static int rt2x00lib_request_firmware(struct rt2x00_dev *rt2x00dev)
                ERROR(rt2x00dev,
                      "Current firmware does not support detected chipset.\n");
                goto exit;
-       };
+       }
 
        rt2x00dev->fw = fw;