23 files changed, 29 insertions, 27 deletions

diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index 241b185e6569..81475ea3a711 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1958,7 +1958,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
                                                  IPG_CONVERGE_JIFFIES;
                 lp->ipg_data.ipg = DEFAULT_IPG;
                 lp->ipg_data.ipg_state = CSTATE;
-        };
+        }
 
         /*  display driver and device information */
 
diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c
index 7e3cfbe89e3b..c9957b7f17b5 100644
--- a/drivers/net/cxgb4/cxgb4_main.c
+++ b/drivers/net/cxgb4/cxgb4_main.c
@@ -3704,7 +3704,7 @@ static int __devinit init_one(struct pci_dev *pdev,
         if (err) {
                 dev_warn(&pdev->dev, "only %d net devices registered\n", i);
                 err = 0;
-        };
+        }
 
         if (cxgb4_debugfs_root) {
                 adapter->debugfs_root = debugfs_create_dir(pci_name(pdev),
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 2f433fbfca0c..5b087ebe632d 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1560,7 +1560,7 @@ static void enic_notify_timer_start(struct enic *enic)
         default:
                 /* Using intr for notification for INTx/MSI-X */
                 break;
-        };
+        }
 }
 
 /* rtnl lock is held, process context */
diff --git a/drivers/net/irda/via-ircc.h b/drivers/net/irda/via-ircc.h
index c6f58482b769..f903a6a2dcb7 100644
--- a/drivers/net/irda/via-ircc.h
+++ b/drivers/net/irda/via-ircc.h
@@ -210,7 +210,7 @@ static void DisableDmaChannel(unsigned int channel)
                 break;
         default:
                 break;
-        };                      //Switch
+        }
 }
 
 static unsigned char ReadLPCReg(int iRegNum)
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 9ece1fd9889d..b6c296f4b4d5 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -538,7 +538,7 @@ static void veth_handle_ack(struct veth_lpevent *event)
         default:
                 veth_error("Unknown ack type %d from LPAR %d.\n",
                                 event->base_event.xSubtype, rlp);
-        };
+        }
 }
 
 static void veth_handle_int(struct veth_lpevent *event)
@@ -584,7 +584,7 @@ static void veth_handle_int(struct veth_lpevent *event)
         default:
                 veth_error("Unknown interrupt type %d from LPAR %d.\n",
                                 event->base_event.xSubtype, rlp);
-        };
+        }
 }
 
 static void veth_handle_event(struct HvLpEvent *event)
diff --git a/drivers/net/ixgbe/ixgbe_82599.c b/drivers/net/ixgbe/ixgbe_82599.c
index 8ee661245af3..0d7bc9156353 100644
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
@@ -1157,7 +1157,7 @@ s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 pballoc)
         default:
                 /* bad value */
                 return IXGBE_ERR_CONFIG;
-        };
+        }
 
         /* Move the flexible bytes to use the ethertype - shift 6 words */
         fdirctrl |= (0x6 << IXGBE_FDIRCTRL_FLEX_SHIFT);
@@ -1245,7 +1245,7 @@ s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 pballoc)
         default:
                 /* bad value */
                 return IXGBE_ERR_CONFIG;
-        };
+        }
 
         /* Turn perfect match filtering on */
         fdirctrl |= IXGBE_FDIRCTRL_PERFECT_MATCH;
diff --git a/drivers/net/ixgbe/ixgbe_common.c b/drivers/net/ixgbe/ixgbe_common.c
index b894b42a741c..de65643b79a4 100644
--- a/drivers/net/ixgbe/ixgbe_common.c
+++ b/drivers/net/ixgbe/ixgbe_common.c
@@ -1292,7 +1292,7 @@ static s32 ixgbe_ready_eeprom(struct ixgbe_hw *hw)
 
                 udelay(5);
                 ixgbe_standby_eeprom(hw);
-        };
+        }
 
         /*
          * On some parts, SPI write time could vary from 0-20mSec on 3.3V
@@ -1374,7 +1374,7 @@ static void ixgbe_shift_out_eeprom_bits(struct ixgbe_hw *hw, u16 data,
                  * EEPROM
                  */
                 mask = mask >> 1;
-        };
+        }
 
         /* We leave the "DI" bit set to "0" when we leave this routine. */
         eec &= ~IXGBE_EEC_DI;
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index bf84849600ce..3f33870de211 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -1013,7 +1013,7 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
                 cmd.data2 = i;
                 status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_SET_INTRQ_DMA,
                                             &cmd, 0);
-        };
+        }
 
         status |=
             myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_IRQ_ACK_OFFSET, &cmd, 0);
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 7f999671c7b2..ca59b4f026f0 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -1279,7 +1279,7 @@ void netxen_free_dummy_dma(struct netxen_adapter *adapter)
 
                         if (--i == 0)
                                 break;
-                };
+                }
         }
 
         if (i) {
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index b1f251da1535..d47abb4e7eb6 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -1009,7 +1009,7 @@ static int gelic_card_decode_one_descr(struct gelic_card *card)
                                 netdev = card->netdev[i];
                                 break;
                         }
-                };
+                }
                 if (GELIC_PORT_MAX <= i) {
                         pr_info("%s: unknown packet vid=%x\n", __func__, vid);
                         goto refill;
diff --git a/drivers/net/slhc.c b/drivers/net/slhc.c
index ab9e3b785b5b..0a0a6643cf3a 100644
--- a/drivers/net/slhc.c
+++ b/drivers/net/slhc.c
@@ -297,7 +297,7 @@ slhc_compress(struct slcompress *comp, unsigned char *icp, int isize,
                 lcs = cs;
                 cs = cs->next;
                 comp->sls_o_searches++;
-        };
+        }
         /*
          * Didn't find it -- re-use oldest cstate.  Send an
          * uncompressed packet that tells the other side what
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index f0bcbe4bce4a..71d4a0329d02 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2716,7 +2716,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                             data->val_in);
                 rc = 0;
                 break;
-        };
+        }
         return rc;
 }
 
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index ff32befd8443..b6162fe2348e 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -304,7 +304,7 @@ static int __devinit xl_probe(struct pci_dev *pdev,
 
         if ((i = pci_request_regions(pdev,"3c359"))) { 
                 return i ; 
-        } ; 
+        }
 
         /* 
          * Allowing init_trdev to allocate the private data will align
@@ -1773,7 +1773,9 @@ static void xl_wait_misr_flags(struct net_device *dev)
         if (readb(xl_mmio + MMIO_MACDATA) != 0) {  /* Misr not clear */
                 for (i=0; i<6; i++) { 
                         writel(MEM_BYTE_READ | 0xDFFE0 | i, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
-                        while (readb(xl_mmio + MMIO_MACDATA) != 0 ) {} ; /* Empty Loop */
+                        while (readb(xl_mmio + MMIO_MACDATA) != 0) {
+                                ;       /* Empty Loop */
+                        }
                 } 
         }
 
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 4786497de03e..e896ad0e8d24 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -177,7 +177,7 @@ static char __devinit *adapter_def(char type)
         case 0xD: return "16/4 Adapter/A (short) | 16/4 ISA-16 Adapter";
         case 0xC: return "Auto 16/4 Adapter";
         default: return "adapter (unknown type)";
-        };
+        }
 };
 
 #define TRC_INIT 0x01           /*  Trace initialization & PROBEs */
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 74e94054ab1a..8a27cbf19dd6 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -666,7 +666,7 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun,
         case TUN_TAP_DEV:
                 skb->protocol = eth_type_trans(skb, tun->dev);
                 break;
-        };
+        }
 
         if (gso.gso_type != VIRTIO_NET_HDR_GSO_NONE) {
                 pr_debug("GSO!\n");
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 06daa9d6fee8..f92924283d3b 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1887,7 +1887,7 @@ static void velocity_error(struct velocity_info *vptr, int status)
                 else
                         netif_wake_queue(vptr->dev);
 
-        };
+        }
         if (status & ISR_MIBFI)
                 velocity_update_hw_mibs(vptr);
         if (status & ISR_LSTEI)
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index eb4159686985..d74bc5ff8e13 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4085,7 +4085,7 @@ static int b43_phy_versioning(struct b43_wldev *dev)
 #endif
         default:
                 unsupported = 1;
-        };
+        }
         if (unsupported) {
                 b43err(dev->wl, "FOUND UNSUPPORTED PHY "
                        "(Analog %u, Type %u, Revision %u)\n",
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 1ab8861dd43a..60107b8e4c93 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -2974,7 +2974,7 @@ static int b43legacy_phy_versioning(struct b43legacy_wldev *dev)
                 break;
         default:
                 unsupported = 1;
-        };
+        }
         if (unsupported) {
                 b43legacyerr(dev->wl, "FOUND UNSUPPORTED PHY "
                        "(Analog %u, Type %u, Revision %u)\n",
diff --git a/drivers/net/wireless/iwmc3200wifi/fw.c b/drivers/net/wireless/iwmc3200wifi/fw.c
index 49067092d336..6f1afe6bbc8c 100644
--- a/drivers/net/wireless/iwmc3200wifi/fw.c
+++ b/drivers/net/wireless/iwmc3200wifi/fw.c
@@ -187,7 +187,7 @@ static int iwm_load_img(struct iwm_priv *iwm, const char *img_name)
                 if (ret < 0)
                         goto err_release_fw;
                 opcode_idx++;
-        };
+        }
 
         /* Read firmware version */
         fw_offset = iwm_fw_op_offset(iwm, fw, IWM_HDR_REC_OP_SW_VER, 0);
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index 62c6b2b37dbe..b0f233f1100e 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -1958,7 +1958,7 @@ irqreturn_t orinoco_interrupt(int irq, void *dev_id)
 
                 evstat = hermes_read_regn(hw, EVSTAT);
                 events = evstat & hw->inten;
-        };
+        }
 
         orinoco_unlock(priv, &flags);
         return IRQ_HANDLED;
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 2a6aa85cc6c9..8f92dfcb08df 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1355,7 +1355,7 @@ static void rt2800_config_ht_opmode(struct rt2x00_dev *rt2x00dev,
                         gf20_rate = gf40_rate = 0x0003;
                 }
                 break;
-        };
+        }
 
         /* check for STAs not supporting greenfield mode */
         if (any_sta_nongf)
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index cc4a54f571b8..3ac0943b9789 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -219,7 +219,7 @@ static void rt2800pci_start_queue(struct data_queue *queue)
                 break;
         default:
                 break;
-        };
+        }
 }
 
 static void rt2800pci_kick_queue(struct data_queue *queue)
diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index ec2800ff8d42..8b8881718f5e 100644
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -731,7 +731,7 @@ static void znet_rx(struct net_device *dev)
                 cur_frame_end_offset -= ((count + 1)>>1) + 3;
                 if (cur_frame_end_offset < 0)
                   cur_frame_end_offset += RX_BUF_SIZE/2;
-        };
+        }
 
         /* Now step  forward through the list. */
         do {