Commit 855e1111 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik

tg3: remove unneeded semicolons

Remove extraneous semicolons after switch and conditional statements.
Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 92fbc1c1
...@@ -1480,7 +1480,7 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state) ...@@ -1480,7 +1480,7 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state)
"requested.\n", "requested.\n",
tp->dev->name, state); tp->dev->name, state);
return -EINVAL; return -EINVAL;
}; }
power_control |= PCI_PM_CTRL_PME_ENABLE; power_control |= PCI_PM_CTRL_PME_ENABLE;
...@@ -1906,7 +1906,7 @@ static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u16 *speed, u8 ...@@ -1906,7 +1906,7 @@ static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u16 *speed, u8
*speed = SPEED_INVALID; *speed = SPEED_INVALID;
*duplex = DUPLEX_INVALID; *duplex = DUPLEX_INVALID;
break; break;
}; }
} }
static void tg3_phy_copper_begin(struct tg3 *tp) static void tg3_phy_copper_begin(struct tg3 *tp)
...@@ -2018,7 +2018,7 @@ static void tg3_phy_copper_begin(struct tg3 *tp) ...@@ -2018,7 +2018,7 @@ static void tg3_phy_copper_begin(struct tg3 *tp)
case SPEED_1000: case SPEED_1000:
bmcr |= TG3_BMCR_SPEED1000; bmcr |= TG3_BMCR_SPEED1000;
break; break;
}; }
if (tp->link_config.duplex == DUPLEX_FULL) if (tp->link_config.duplex == DUPLEX_FULL)
bmcr |= BMCR_FULLDPLX; bmcr |= BMCR_FULLDPLX;
...@@ -2716,7 +2716,7 @@ static int tg3_fiber_aneg_smachine(struct tg3 *tp, ...@@ -2716,7 +2716,7 @@ static int tg3_fiber_aneg_smachine(struct tg3 *tp,
default: default:
ret = ANEG_FAILED; ret = ANEG_FAILED;
break; break;
}; }
return ret; return ret;
} }
...@@ -3558,7 +3558,7 @@ static int tg3_alloc_rx_skb(struct tg3 *tp, u32 opaque_key, ...@@ -3558,7 +3558,7 @@ static int tg3_alloc_rx_skb(struct tg3 *tp, u32 opaque_key,
default: default:
return -EINVAL; return -EINVAL;
}; }
/* Do not overwrite any of the map or rp information /* Do not overwrite any of the map or rp information
* until we are sure we can commit to a new buffer. * until we are sure we can commit to a new buffer.
...@@ -3618,7 +3618,7 @@ static void tg3_recycle_rx(struct tg3 *tp, u32 opaque_key, ...@@ -3618,7 +3618,7 @@ static void tg3_recycle_rx(struct tg3 *tp, u32 opaque_key,
default: default:
return; return;
}; }
dest_map->skb = src_map->skb; dest_map->skb = src_map->skb;
pci_unmap_addr_set(dest_map, mapping, pci_unmap_addr_set(dest_map, mapping,
...@@ -4961,7 +4961,7 @@ static int tg3_stop_block(struct tg3 *tp, unsigned long ofs, u32 enable_bit, int ...@@ -4961,7 +4961,7 @@ static int tg3_stop_block(struct tg3 *tp, unsigned long ofs, u32 enable_bit, int
default: default:
break; break;
}; }
} }
val = tr32(ofs); val = tr32(ofs);
...@@ -5203,7 +5203,7 @@ static void tg3_write_sig_pre_reset(struct tg3 *tp, int kind) ...@@ -5203,7 +5203,7 @@ static void tg3_write_sig_pre_reset(struct tg3 *tp, int kind)
default: default:
break; break;
}; }
} }
if (kind == RESET_KIND_INIT || if (kind == RESET_KIND_INIT ||
...@@ -5228,7 +5228,7 @@ static void tg3_write_sig_post_reset(struct tg3 *tp, int kind) ...@@ -5228,7 +5228,7 @@ static void tg3_write_sig_post_reset(struct tg3 *tp, int kind)
default: default:
break; break;
}; }
} }
if (kind == RESET_KIND_SHUTDOWN) if (kind == RESET_KIND_SHUTDOWN)
...@@ -5257,7 +5257,7 @@ static void tg3_write_sig_legacy(struct tg3 *tp, int kind) ...@@ -5257,7 +5257,7 @@ static void tg3_write_sig_legacy(struct tg3 *tp, int kind)
default: default:
break; break;
}; }
} }
} }
...@@ -7282,7 +7282,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) ...@@ -7282,7 +7282,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
default: default:
break; break;
}; }
if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE) if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)
/* Write our heartbeat update interval to APE. */ /* Write our heartbeat update interval to APE. */
...@@ -10879,7 +10879,7 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp) ...@@ -10879,7 +10879,7 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
LED_CTRL_MODE_PHY_2); LED_CTRL_MODE_PHY_2);
break; break;
}; }
if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 || if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) && GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) &&
...@@ -12178,7 +12178,7 @@ static u32 __devinit tg3_calc_dma_bndry(struct tg3 *tp, u32 val) ...@@ -12178,7 +12178,7 @@ static u32 __devinit tg3_calc_dma_bndry(struct tg3 *tp, u32 val)
val |= (DMA_RWCTRL_READ_BNDRY_384_PCIX | val |= (DMA_RWCTRL_READ_BNDRY_384_PCIX |
DMA_RWCTRL_WRITE_BNDRY_384_PCIX); DMA_RWCTRL_WRITE_BNDRY_384_PCIX);
break; break;
}; }
} else if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) { } else if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
switch (cacheline_size) { switch (cacheline_size) {
case 16: case 16:
...@@ -12195,7 +12195,7 @@ static u32 __devinit tg3_calc_dma_bndry(struct tg3 *tp, u32 val) ...@@ -12195,7 +12195,7 @@ static u32 __devinit tg3_calc_dma_bndry(struct tg3 *tp, u32 val)
val &= ~DMA_RWCTRL_WRITE_BNDRY_DISAB_PCIE; val &= ~DMA_RWCTRL_WRITE_BNDRY_DISAB_PCIE;
val |= DMA_RWCTRL_WRITE_BNDRY_128_PCIE; val |= DMA_RWCTRL_WRITE_BNDRY_128_PCIE;
break; break;
}; }
} else { } else {
switch (cacheline_size) { switch (cacheline_size) {
case 16: case 16:
...@@ -12239,7 +12239,7 @@ static u32 __devinit tg3_calc_dma_bndry(struct tg3 *tp, u32 val) ...@@ -12239,7 +12239,7 @@ static u32 __devinit tg3_calc_dma_bndry(struct tg3 *tp, u32 val)
val |= (DMA_RWCTRL_READ_BNDRY_1024 | val |= (DMA_RWCTRL_READ_BNDRY_1024 |
DMA_RWCTRL_WRITE_BNDRY_1024); DMA_RWCTRL_WRITE_BNDRY_1024);
break; break;
}; }
} }
out: out:
...@@ -12599,7 +12599,7 @@ static char * __devinit tg3_phy_string(struct tg3 *tp) ...@@ -12599,7 +12599,7 @@ static char * __devinit tg3_phy_string(struct tg3 *tp)
case PHY_ID_BCM8002: return "8002/serdes"; case PHY_ID_BCM8002: return "8002/serdes";
case 0: return "serdes"; case 0: return "serdes";
default: return "unknown"; default: return "unknown";
}; }
} }
static char * __devinit tg3_bus_string(struct tg3 *tp, char *str) static char * __devinit tg3_bus_string(struct tg3 *tp, char *str)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment