aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-08-18 14:18:35 -0400
committerJiri Kosina <jkosina@suse.cz>2009-09-21 09:14:58 -0400
commita419aef8b858a2bdb98df60336063d28df4b272f (patch)
tree1736f6650ec0bfc01074c489fc47396114099c5e /drivers/net
parent2944fcbe03d65a704f07e43efe14adb0d226fd09 (diff)
trivial: remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/arcnet/arc-rawmode.c1
-rw-r--r--drivers/net/arcnet/capmode.c1
-rw-r--r--drivers/net/gianfar_ethtool.c2
-rw-r--r--drivers/net/ibm_newemac/core.c8
-rw-r--r--drivers/net/igb/igb_main.c2
-rw-r--r--drivers/net/ll_temac_main.c2
-rw-r--r--drivers/net/ni52.c4
-rw-r--r--drivers/net/qlge/qlge_main.c4
-rw-r--r--drivers/net/skfp/pcmplc.c2
-rw-r--r--drivers/net/skfp/pmf.c8
-rw-r--r--drivers/net/skge.c2
-rw-r--r--drivers/net/sky2.c2
-rw-r--r--drivers/net/vxge/vxge-config.h2
-rw-r--r--drivers/net/vxge/vxge-main.c2
14 files changed, 20 insertions, 22 deletions
diff --git a/drivers/net/arcnet/arc-rawmode.c b/drivers/net/arcnet/arc-rawmode.c
index 646dfc5f50c9..8ea9c7545c12 100644
--- a/drivers/net/arcnet/arc-rawmode.c
+++ b/drivers/net/arcnet/arc-rawmode.c
@@ -123,7 +123,6 @@ static void rx(struct net_device *dev, int bufnum,
123 BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx"); 123 BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx");
124 124
125 skb->protocol = cpu_to_be16(ETH_P_ARCNET); 125 skb->protocol = cpu_to_be16(ETH_P_ARCNET);
126;
127 netif_rx(skb); 126 netif_rx(skb);
128} 127}
129 128
diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c
index 083e21094b20..66bcbbb6babc 100644
--- a/drivers/net/arcnet/capmode.c
+++ b/drivers/net/arcnet/capmode.c
@@ -149,7 +149,6 @@ static void rx(struct net_device *dev, int bufnum,
149 BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx"); 149 BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx");
150 150
151 skb->protocol = cpu_to_be16(ETH_P_ARCNET); 151 skb->protocol = cpu_to_be16(ETH_P_ARCNET);
152;
153 netif_rx(skb); 152 netif_rx(skb);
154} 153}
155 154
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c
index 2234118eedbb..6c144b525b47 100644
--- a/drivers/net/gianfar_ethtool.c
+++ b/drivers/net/gianfar_ethtool.c
@@ -293,7 +293,7 @@ static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals
293 rxtime = get_ictt_value(priv->rxic); 293 rxtime = get_ictt_value(priv->rxic);
294 rxcount = get_icft_value(priv->rxic); 294 rxcount = get_icft_value(priv->rxic);
295 txtime = get_ictt_value(priv->txic); 295 txtime = get_ictt_value(priv->txic);
296 txcount = get_icft_value(priv->txic);; 296 txcount = get_icft_value(priv->txic);
297 cvals->rx_coalesce_usecs = gfar_ticks2usecs(priv, rxtime); 297 cvals->rx_coalesce_usecs = gfar_ticks2usecs(priv, rxtime);
298 cvals->rx_max_coalesced_frames = rxcount; 298 cvals->rx_max_coalesced_frames = rxcount;
299 299
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 1d7d7fef414f..89c82c5e63e4 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -2556,13 +2556,13 @@ static int __devinit emac_init_config(struct emac_instance *dev)
2556 if (emac_read_uint_prop(np, "mdio-device", &dev->mdio_ph, 0)) 2556 if (emac_read_uint_prop(np, "mdio-device", &dev->mdio_ph, 0))
2557 dev->mdio_ph = 0; 2557 dev->mdio_ph = 0;
2558 if (emac_read_uint_prop(np, "zmii-device", &dev->zmii_ph, 0)) 2558 if (emac_read_uint_prop(np, "zmii-device", &dev->zmii_ph, 0))
2559 dev->zmii_ph = 0;; 2559 dev->zmii_ph = 0;
2560 if (emac_read_uint_prop(np, "zmii-channel", &dev->zmii_port, 0)) 2560 if (emac_read_uint_prop(np, "zmii-channel", &dev->zmii_port, 0))
2561 dev->zmii_port = 0xffffffff;; 2561 dev->zmii_port = 0xffffffff;
2562 if (emac_read_uint_prop(np, "rgmii-device", &dev->rgmii_ph, 0)) 2562 if (emac_read_uint_prop(np, "rgmii-device", &dev->rgmii_ph, 0))
2563 dev->rgmii_ph = 0;; 2563 dev->rgmii_ph = 0;
2564 if (emac_read_uint_prop(np, "rgmii-channel", &dev->rgmii_port, 0)) 2564 if (emac_read_uint_prop(np, "rgmii-channel", &dev->rgmii_port, 0))
2565 dev->rgmii_port = 0xffffffff;; 2565 dev->rgmii_port = 0xffffffff;
2566 if (emac_read_uint_prop(np, "fifo-entry-size", &dev->fifo_entry_size, 0)) 2566 if (emac_read_uint_prop(np, "fifo-entry-size", &dev->fifo_entry_size, 0))
2567 dev->fifo_entry_size = 16; 2567 dev->fifo_entry_size = 16;
2568 if (emac_read_uint_prop(np, "mal-burst-size", &dev->mal_burst_size, 0)) 2568 if (emac_read_uint_prop(np, "mal-burst-size", &dev->mal_burst_size, 0))
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index d2639c4a086d..5d6c1530a8c0 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -3966,7 +3966,7 @@ static int igb_set_vf_multicasts(struct igb_adapter *adapter,
3966 /* VFs are limited to using the MTA hash table for their multicast 3966 /* VFs are limited to using the MTA hash table for their multicast
3967 * addresses */ 3967 * addresses */
3968 for (i = 0; i < n; i++) 3968 for (i = 0; i < n; i++)
3969 vf_data->vf_mc_hashes[i] = hash_list[i];; 3969 vf_data->vf_mc_hashes[i] = hash_list[i];
3970 3970
3971 /* Flush and reset the mta with the new values */ 3971 /* Flush and reset the mta with the new values */
3972 igb_set_rx_mode(adapter->netdev); 3972 igb_set_rx_mode(adapter->netdev);
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index da8d0a0ca94f..f2a197fd47a5 100644
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -865,7 +865,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
865 dcrs = dcr_resource_start(np, 0); 865 dcrs = dcr_resource_start(np, 0);
866 if (dcrs == 0) { 866 if (dcrs == 0) {
867 dev_err(&op->dev, "could not get DMA register address\n"); 867 dev_err(&op->dev, "could not get DMA register address\n");
868 goto nodev;; 868 goto nodev;
869 } 869 }
870 lp->sdma_dcrs = dcr_map(np, dcrs, dcr_resource_len(np, 0)); 870 lp->sdma_dcrs = dcr_map(np, dcrs, dcr_resource_len(np, 0));
871 dev_dbg(&op->dev, "DCR base: %x\n", dcrs); 871 dev_dbg(&op->dev, "DCR base: %x\n", dcrs);
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index bd0ac690d12c..aad3b370c562 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -615,10 +615,10 @@ static int init586(struct net_device *dev)
615 /* addr_len |!src_insert |pre-len |loopback */ 615 /* addr_len |!src_insert |pre-len |loopback */
616 writeb(0x2e, &cfg_cmd->adr_len); 616 writeb(0x2e, &cfg_cmd->adr_len);
617 writeb(0x00, &cfg_cmd->priority); 617 writeb(0x00, &cfg_cmd->priority);
618 writeb(0x60, &cfg_cmd->ifs);; 618 writeb(0x60, &cfg_cmd->ifs);
619 writeb(0x00, &cfg_cmd->time_low); 619 writeb(0x00, &cfg_cmd->time_low);
620 writeb(0xf2, &cfg_cmd->time_high); 620 writeb(0xf2, &cfg_cmd->time_high);
621 writeb(0x00, &cfg_cmd->promisc);; 621 writeb(0x00, &cfg_cmd->promisc);
622 if (dev->flags & IFF_ALLMULTI) { 622 if (dev->flags & IFF_ALLMULTI) {
623 int len = ((char __iomem *)p->iscp - (char __iomem *)ptr - 8) / 6; 623 int len = ((char __iomem *)p->iscp - (char __iomem *)ptr - 8) / 6;
624 if (num_addrs > len) { 624 if (num_addrs > len) {
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 220529257828..7783c5db81dc 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -2630,7 +2630,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)
2630 FLAGS_LI; /* Load irq delay values */ 2630 FLAGS_LI; /* Load irq delay values */
2631 if (rx_ring->lbq_len) { 2631 if (rx_ring->lbq_len) {
2632 cqicb->flags |= FLAGS_LL; /* Load lbq values */ 2632 cqicb->flags |= FLAGS_LL; /* Load lbq values */
2633 tmp = (u64)rx_ring->lbq_base_dma;; 2633 tmp = (u64)rx_ring->lbq_base_dma;
2634 base_indirect_ptr = (__le64 *) rx_ring->lbq_base_indirect; 2634 base_indirect_ptr = (__le64 *) rx_ring->lbq_base_indirect;
2635 page_entries = 0; 2635 page_entries = 0;
2636 do { 2636 do {
@@ -2654,7 +2654,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)
2654 } 2654 }
2655 if (rx_ring->sbq_len) { 2655 if (rx_ring->sbq_len) {
2656 cqicb->flags |= FLAGS_LS; /* Load sbq values */ 2656 cqicb->flags |= FLAGS_LS; /* Load sbq values */
2657 tmp = (u64)rx_ring->sbq_base_dma;; 2657 tmp = (u64)rx_ring->sbq_base_dma;
2658 base_indirect_ptr = (__le64 *) rx_ring->sbq_base_indirect; 2658 base_indirect_ptr = (__le64 *) rx_ring->sbq_base_indirect;
2659 page_entries = 0; 2659 page_entries = 0;
2660 do { 2660 do {
diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/skfp/pcmplc.c
index f1df2ec8ad41..e6b33ee05ede 100644
--- a/drivers/net/skfp/pcmplc.c
+++ b/drivers/net/skfp/pcmplc.c
@@ -960,7 +960,7 @@ static void pcm_fsm(struct s_smc *smc, struct s_phy *phy, int cmd)
960 /*PC88b*/ 960 /*PC88b*/
961 if (!phy->cf_join) { 961 if (!phy->cf_join) {
962 phy->cf_join = TRUE ; 962 phy->cf_join = TRUE ;
963 queue_event(smc,EVENT_CFM,CF_JOIN+np) ; ; 963 queue_event(smc,EVENT_CFM,CF_JOIN+np) ;
964 } 964 }
965 if (cmd == PC_JOIN) 965 if (cmd == PC_JOIN)
966 GO_STATE(PC8_ACTIVE) ; 966 GO_STATE(PC8_ACTIVE) ;
diff --git a/drivers/net/skfp/pmf.c b/drivers/net/skfp/pmf.c
index 79e665e0853d..a320fdb3727d 100644
--- a/drivers/net/skfp/pmf.c
+++ b/drivers/net/skfp/pmf.c
@@ -807,9 +807,9 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
807 mib_p->fddiPORTLerFlag ; 807 mib_p->fddiPORTLerFlag ;
808 sp->p4050_pad = 0 ; 808 sp->p4050_pad = 0 ;
809 sp->p4050_cutoff = 809 sp->p4050_cutoff =
810 mib_p->fddiPORTLer_Cutoff ; ; 810 mib_p->fddiPORTLer_Cutoff ;
811 sp->p4050_alarm = 811 sp->p4050_alarm =
812 mib_p->fddiPORTLer_Alarm ; ; 812 mib_p->fddiPORTLer_Alarm ;
813 sp->p4050_estimate = 813 sp->p4050_estimate =
814 mib_p->fddiPORTLer_Estimate ; 814 mib_p->fddiPORTLer_Estimate ;
815 sp->p4050_reject_ct = 815 sp->p4050_reject_ct =
@@ -829,7 +829,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
829 sp->p4051_porttype = 829 sp->p4051_porttype =
830 mib_p->fddiPORTMy_Type ; 830 mib_p->fddiPORTMy_Type ;
831 sp->p4051_connectstate = 831 sp->p4051_connectstate =
832 mib_p->fddiPORTConnectState ; ; 832 mib_p->fddiPORTConnectState ;
833 sp->p4051_pc_neighbor = 833 sp->p4051_pc_neighbor =
834 mib_p->fddiPORTNeighborType ; 834 mib_p->fddiPORTNeighborType ;
835 sp->p4051_pc_withhold = 835 sp->p4051_pc_withhold =
@@ -853,7 +853,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
853 struct smt_p_4053 *sp ; 853 struct smt_p_4053 *sp ;
854 sp = (struct smt_p_4053 *) to ; 854 sp = (struct smt_p_4053 *) to ;
855 sp->p4053_multiple = 855 sp->p4053_multiple =
856 mib_p->fddiPORTMultiple_P ; ; 856 mib_p->fddiPORTMultiple_P ;
857 sp->p4053_availablepaths = 857 sp->p4053_availablepaths =
858 mib_p->fddiPORTAvailablePaths ; 858 mib_p->fddiPORTAvailablePaths ;
859 sp->p4053_currentpath = 859 sp->p4053_currentpath =
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 62e852e21ab2..55bad4081966 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -215,7 +215,7 @@ static void skge_wol_init(struct skge_port *skge)
215 if (skge->wol & WAKE_MAGIC) 215 if (skge->wol & WAKE_MAGIC)
216 ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT; 216 ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT;
217 else 217 else
218 ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;; 218 ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;
219 219
220 ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT; 220 ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT;
221 skge_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl); 221 skge_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl);
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 4bb52e9cd371..15140f9f2e92 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -765,7 +765,7 @@ static void sky2_wol_init(struct sky2_port *sky2)
765 if (sky2->wol & WAKE_MAGIC) 765 if (sky2->wol & WAKE_MAGIC)
766 ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT; 766 ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT;
767 else 767 else
768 ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;; 768 ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;
769 769
770 ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT; 770 ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT;
771 sky2_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl); 771 sky2_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl);
diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/vxge/vxge-config.h
index 62779a520ca1..3e94f0ce0900 100644
--- a/drivers/net/vxge/vxge-config.h
+++ b/drivers/net/vxge/vxge-config.h
@@ -1541,7 +1541,7 @@ void vxge_hw_ring_rxd_1b_info_get(
1541 rxd_info->l4_cksum_valid = 1541 rxd_info->l4_cksum_valid =
1542 (u32)VXGE_HW_RING_RXD_L4_CKSUM_CORRECT_GET(rxdp->control_0); 1542 (u32)VXGE_HW_RING_RXD_L4_CKSUM_CORRECT_GET(rxdp->control_0);
1543 rxd_info->l4_cksum = 1543 rxd_info->l4_cksum =
1544 (u32)VXGE_HW_RING_RXD_L4_CKSUM_GET(rxdp->control_0);; 1544 (u32)VXGE_HW_RING_RXD_L4_CKSUM_GET(rxdp->control_0);
1545 rxd_info->frame = 1545 rxd_info->frame =
1546 (u32)VXGE_HW_RING_RXD_ETHER_ENCAP_GET(rxdp->control_0); 1546 (u32)VXGE_HW_RING_RXD_ETHER_ENCAP_GET(rxdp->control_0);
1547 rxd_info->proto = 1547 rxd_info->proto =
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index b378037a29b5..068d7a9d3e36 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -2350,7 +2350,7 @@ static int vxge_enable_msix(struct vxgedev *vdev)
2350 enum vxge_hw_status status; 2350 enum vxge_hw_status status;
2351 /* 0 - Tx, 1 - Rx */ 2351 /* 0 - Tx, 1 - Rx */
2352 int tim_msix_id[4]; 2352 int tim_msix_id[4];
2353 int alarm_msix_id = 0, msix_intr_vect = 0;; 2353 int alarm_msix_id = 0, msix_intr_vect = 0;
2354 vdev->intr_cnt = 0; 2354 vdev->intr_cnt = 0;
2355 2355
2356 /* allocate msix vectors */ 2356 /* allocate msix vectors */