提交 6403eab1 编写于 作者: J Joe Perches 提交者: David S. Miller

drivers/net: Remove unnecessary semicolons

Semicolons are not necessary after switch/while/for/if braces
so remove them.
Signed-off-by: NJoe Perches <joe@perches.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 f81c6224
...@@ -1958,7 +1958,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev, ...@@ -1958,7 +1958,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
IPG_CONVERGE_JIFFIES; IPG_CONVERGE_JIFFIES;
lp->ipg_data.ipg = DEFAULT_IPG; lp->ipg_data.ipg = DEFAULT_IPG;
lp->ipg_data.ipg_state = CSTATE; lp->ipg_data.ipg_state = CSTATE;
}; }
/* display driver and device information */ /* display driver and device information */
......
...@@ -3704,7 +3704,7 @@ static int __devinit init_one(struct pci_dev *pdev, ...@@ -3704,7 +3704,7 @@ static int __devinit init_one(struct pci_dev *pdev,
if (err) { if (err) {
dev_warn(&pdev->dev, "only %d net devices registered\n", i); dev_warn(&pdev->dev, "only %d net devices registered\n", i);
err = 0; err = 0;
}; }
if (cxgb4_debugfs_root) { if (cxgb4_debugfs_root) {
adapter->debugfs_root = debugfs_create_dir(pci_name(pdev), adapter->debugfs_root = debugfs_create_dir(pci_name(pdev),
......
...@@ -1560,7 +1560,7 @@ static void enic_notify_timer_start(struct enic *enic) ...@@ -1560,7 +1560,7 @@ static void enic_notify_timer_start(struct enic *enic)
default: default:
/* Using intr for notification for INTx/MSI-X */ /* Using intr for notification for INTx/MSI-X */
break; break;
}; }
} }
/* rtnl lock is held, process context */ /* rtnl lock is held, process context */
......
...@@ -210,7 +210,7 @@ static void DisableDmaChannel(unsigned int channel) ...@@ -210,7 +210,7 @@ static void DisableDmaChannel(unsigned int channel)
break; break;
default: default:
break; break;
}; //Switch }
} }
static unsigned char ReadLPCReg(int iRegNum) static unsigned char ReadLPCReg(int iRegNum)
......
...@@ -538,7 +538,7 @@ static void veth_handle_ack(struct veth_lpevent *event) ...@@ -538,7 +538,7 @@ static void veth_handle_ack(struct veth_lpevent *event)
default: default:
veth_error("Unknown ack type %d from LPAR %d.\n", veth_error("Unknown ack type %d from LPAR %d.\n",
event->base_event.xSubtype, rlp); event->base_event.xSubtype, rlp);
}; }
} }
static void veth_handle_int(struct veth_lpevent *event) static void veth_handle_int(struct veth_lpevent *event)
...@@ -584,7 +584,7 @@ static void veth_handle_int(struct veth_lpevent *event) ...@@ -584,7 +584,7 @@ static void veth_handle_int(struct veth_lpevent *event)
default: default:
veth_error("Unknown interrupt type %d from LPAR %d.\n", veth_error("Unknown interrupt type %d from LPAR %d.\n",
event->base_event.xSubtype, rlp); event->base_event.xSubtype, rlp);
}; }
} }
static void veth_handle_event(struct HvLpEvent *event) static void veth_handle_event(struct HvLpEvent *event)
......
...@@ -1157,7 +1157,7 @@ s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 pballoc) ...@@ -1157,7 +1157,7 @@ s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 pballoc)
default: default:
/* bad value */ /* bad value */
return IXGBE_ERR_CONFIG; return IXGBE_ERR_CONFIG;
}; }
/* Move the flexible bytes to use the ethertype - shift 6 words */ /* Move the flexible bytes to use the ethertype - shift 6 words */
fdirctrl |= (0x6 << IXGBE_FDIRCTRL_FLEX_SHIFT); fdirctrl |= (0x6 << IXGBE_FDIRCTRL_FLEX_SHIFT);
...@@ -1245,7 +1245,7 @@ s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 pballoc) ...@@ -1245,7 +1245,7 @@ s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 pballoc)
default: default:
/* bad value */ /* bad value */
return IXGBE_ERR_CONFIG; return IXGBE_ERR_CONFIG;
}; }
/* Turn perfect match filtering on */ /* Turn perfect match filtering on */
fdirctrl |= IXGBE_FDIRCTRL_PERFECT_MATCH; fdirctrl |= IXGBE_FDIRCTRL_PERFECT_MATCH;
......
...@@ -1292,7 +1292,7 @@ static s32 ixgbe_ready_eeprom(struct ixgbe_hw *hw) ...@@ -1292,7 +1292,7 @@ static s32 ixgbe_ready_eeprom(struct ixgbe_hw *hw)
udelay(5); udelay(5);
ixgbe_standby_eeprom(hw); ixgbe_standby_eeprom(hw);
}; }
/* /*
* On some parts, SPI write time could vary from 0-20mSec on 3.3V * 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, ...@@ -1374,7 +1374,7 @@ static void ixgbe_shift_out_eeprom_bits(struct ixgbe_hw *hw, u16 data,
* EEPROM * EEPROM
*/ */
mask = mask >> 1; mask = mask >> 1;
}; }
/* We leave the "DI" bit set to "0" when we leave this routine. */ /* We leave the "DI" bit set to "0" when we leave this routine. */
eec &= ~IXGBE_EEC_DI; eec &= ~IXGBE_EEC_DI;
......
...@@ -1013,7 +1013,7 @@ static int myri10ge_reset(struct myri10ge_priv *mgp) ...@@ -1013,7 +1013,7 @@ static int myri10ge_reset(struct myri10ge_priv *mgp)
cmd.data2 = i; cmd.data2 = i;
status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_SET_INTRQ_DMA, status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_SET_INTRQ_DMA,
&cmd, 0); &cmd, 0);
}; }
status |= status |=
myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_IRQ_ACK_OFFSET, &cmd, 0); myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_IRQ_ACK_OFFSET, &cmd, 0);
......
...@@ -1279,7 +1279,7 @@ void netxen_free_dummy_dma(struct netxen_adapter *adapter) ...@@ -1279,7 +1279,7 @@ void netxen_free_dummy_dma(struct netxen_adapter *adapter)
if (--i == 0) if (--i == 0)
break; break;
}; }
} }
if (i) { if (i) {
......
...@@ -1009,7 +1009,7 @@ static int gelic_card_decode_one_descr(struct gelic_card *card) ...@@ -1009,7 +1009,7 @@ static int gelic_card_decode_one_descr(struct gelic_card *card)
netdev = card->netdev[i]; netdev = card->netdev[i];
break; break;
} }
}; }
if (GELIC_PORT_MAX <= i) { if (GELIC_PORT_MAX <= i) {
pr_info("%s: unknown packet vid=%x\n", __func__, vid); pr_info("%s: unknown packet vid=%x\n", __func__, vid);
goto refill; goto refill;
......
...@@ -297,7 +297,7 @@ slhc_compress(struct slcompress *comp, unsigned char *icp, int isize, ...@@ -297,7 +297,7 @@ slhc_compress(struct slcompress *comp, unsigned char *icp, int isize,
lcs = cs; lcs = cs;
cs = cs->next; cs = cs->next;
comp->sls_o_searches++; comp->sls_o_searches++;
}; }
/* /*
* Didn't find it -- re-use oldest cstate. Send an * Didn't find it -- re-use oldest cstate. Send an
* uncompressed packet that tells the other side what * uncompressed packet that tells the other side what
......
...@@ -2716,7 +2716,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -2716,7 +2716,7 @@ static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
data->val_in); data->val_in);
rc = 0; rc = 0;
break; break;
}; }
return rc; return rc;
} }
......
...@@ -304,7 +304,7 @@ static int __devinit xl_probe(struct pci_dev *pdev, ...@@ -304,7 +304,7 @@ static int __devinit xl_probe(struct pci_dev *pdev,
if ((i = pci_request_regions(pdev,"3c359"))) { if ((i = pci_request_regions(pdev,"3c359"))) {
return i ; return i ;
} ; }
/* /*
* Allowing init_trdev to allocate the private data will align * Allowing init_trdev to allocate the private data will align
...@@ -1773,7 +1773,9 @@ static void xl_wait_misr_flags(struct net_device *dev) ...@@ -1773,7 +1773,9 @@ static void xl_wait_misr_flags(struct net_device *dev)
if (readb(xl_mmio + MMIO_MACDATA) != 0) { /* Misr not clear */ if (readb(xl_mmio + MMIO_MACDATA) != 0) { /* Misr not clear */
for (i=0; i<6; i++) { for (i=0; i<6; i++) {
writel(MEM_BYTE_READ | 0xDFFE0 | i, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 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 */
}
} }
} }
......
...@@ -177,7 +177,7 @@ static char __devinit *adapter_def(char type) ...@@ -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 0xD: return "16/4 Adapter/A (short) | 16/4 ISA-16 Adapter";
case 0xC: return "Auto 16/4 Adapter"; case 0xC: return "Auto 16/4 Adapter";
default: return "adapter (unknown type)"; default: return "adapter (unknown type)";
}; }
}; };
#define TRC_INIT 0x01 /* Trace initialization & PROBEs */ #define TRC_INIT 0x01 /* Trace initialization & PROBEs */
......
...@@ -666,7 +666,7 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun, ...@@ -666,7 +666,7 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun,
case TUN_TAP_DEV: case TUN_TAP_DEV:
skb->protocol = eth_type_trans(skb, tun->dev); skb->protocol = eth_type_trans(skb, tun->dev);
break; break;
}; }
if (gso.gso_type != VIRTIO_NET_HDR_GSO_NONE) { if (gso.gso_type != VIRTIO_NET_HDR_GSO_NONE) {
pr_debug("GSO!\n"); pr_debug("GSO!\n");
......
...@@ -1887,7 +1887,7 @@ static void velocity_error(struct velocity_info *vptr, int status) ...@@ -1887,7 +1887,7 @@ static void velocity_error(struct velocity_info *vptr, int status)
else else
netif_wake_queue(vptr->dev); netif_wake_queue(vptr->dev);
}; }
if (status & ISR_MIBFI) if (status & ISR_MIBFI)
velocity_update_hw_mibs(vptr); velocity_update_hw_mibs(vptr);
if (status & ISR_LSTEI) if (status & ISR_LSTEI)
......
...@@ -4085,7 +4085,7 @@ static int b43_phy_versioning(struct b43_wldev *dev) ...@@ -4085,7 +4085,7 @@ static int b43_phy_versioning(struct b43_wldev *dev)
#endif #endif
default: default:
unsupported = 1; unsupported = 1;
}; }
if (unsupported) { if (unsupported) {
b43err(dev->wl, "FOUND UNSUPPORTED PHY " b43err(dev->wl, "FOUND UNSUPPORTED PHY "
"(Analog %u, Type %u, Revision %u)\n", "(Analog %u, Type %u, Revision %u)\n",
......
...@@ -2974,7 +2974,7 @@ static int b43legacy_phy_versioning(struct b43legacy_wldev *dev) ...@@ -2974,7 +2974,7 @@ static int b43legacy_phy_versioning(struct b43legacy_wldev *dev)
break; break;
default: default:
unsupported = 1; unsupported = 1;
}; }
if (unsupported) { if (unsupported) {
b43legacyerr(dev->wl, "FOUND UNSUPPORTED PHY " b43legacyerr(dev->wl, "FOUND UNSUPPORTED PHY "
"(Analog %u, Type %u, Revision %u)\n", "(Analog %u, Type %u, Revision %u)\n",
......
...@@ -187,7 +187,7 @@ static int iwm_load_img(struct iwm_priv *iwm, const char *img_name) ...@@ -187,7 +187,7 @@ static int iwm_load_img(struct iwm_priv *iwm, const char *img_name)
if (ret < 0) if (ret < 0)
goto err_release_fw; goto err_release_fw;
opcode_idx++; opcode_idx++;
}; }
/* Read firmware version */ /* Read firmware version */
fw_offset = iwm_fw_op_offset(iwm, fw, IWM_HDR_REC_OP_SW_VER, 0); fw_offset = iwm_fw_op_offset(iwm, fw, IWM_HDR_REC_OP_SW_VER, 0);
......
...@@ -1958,7 +1958,7 @@ irqreturn_t orinoco_interrupt(int irq, void *dev_id) ...@@ -1958,7 +1958,7 @@ irqreturn_t orinoco_interrupt(int irq, void *dev_id)
evstat = hermes_read_regn(hw, EVSTAT); evstat = hermes_read_regn(hw, EVSTAT);
events = evstat & hw->inten; events = evstat & hw->inten;
}; }
orinoco_unlock(priv, &flags); orinoco_unlock(priv, &flags);
return IRQ_HANDLED; return IRQ_HANDLED;
......
...@@ -1355,7 +1355,7 @@ static void rt2800_config_ht_opmode(struct rt2x00_dev *rt2x00dev, ...@@ -1355,7 +1355,7 @@ static void rt2800_config_ht_opmode(struct rt2x00_dev *rt2x00dev,
gf20_rate = gf40_rate = 0x0003; gf20_rate = gf40_rate = 0x0003;
} }
break; break;
}; }
/* check for STAs not supporting greenfield mode */ /* check for STAs not supporting greenfield mode */
if (any_sta_nongf) if (any_sta_nongf)
......
...@@ -219,7 +219,7 @@ static void rt2800pci_start_queue(struct data_queue *queue) ...@@ -219,7 +219,7 @@ static void rt2800pci_start_queue(struct data_queue *queue)
break; break;
default: default:
break; break;
}; }
} }
static void rt2800pci_kick_queue(struct data_queue *queue) static void rt2800pci_kick_queue(struct data_queue *queue)
......
...@@ -731,7 +731,7 @@ static void znet_rx(struct net_device *dev) ...@@ -731,7 +731,7 @@ static void znet_rx(struct net_device *dev)
cur_frame_end_offset -= ((count + 1)>>1) + 3; cur_frame_end_offset -= ((count + 1)>>1) + 3;
if (cur_frame_end_offset < 0) if (cur_frame_end_offset < 0)
cur_frame_end_offset += RX_BUF_SIZE/2; cur_frame_end_offset += RX_BUF_SIZE/2;
}; }
/* Now step forward through the list. */ /* Now step forward through the list. */
do { do {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册