Remove extraneous semicolons after switch and conditional statements.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
"requested.\n",
tp->dev->name, state);
return -EINVAL;
"requested.\n",
tp->dev->name, state);
return -EINVAL;
power_control |= PCI_PM_CTRL_PME_ENABLE;
power_control |= PCI_PM_CTRL_PME_ENABLE;
*speed = SPEED_INVALID;
*duplex = DUPLEX_INVALID;
break;
*speed = SPEED_INVALID;
*duplex = DUPLEX_INVALID;
break;
}
static void tg3_phy_copper_begin(struct tg3 *tp)
}
static void tg3_phy_copper_begin(struct tg3 *tp)
case SPEED_1000:
bmcr |= TG3_BMCR_SPEED1000;
break;
case SPEED_1000:
bmcr |= TG3_BMCR_SPEED1000;
break;
if (tp->link_config.duplex == DUPLEX_FULL)
bmcr |= BMCR_FULLDPLX;
if (tp->link_config.duplex == DUPLEX_FULL)
bmcr |= BMCR_FULLDPLX;
default:
ret = ANEG_FAILED;
break;
default:
ret = ANEG_FAILED;
break;
/* Do not overwrite any of the map or rp information
* until we are sure we can commit to a new buffer.
/* Do not overwrite any of the map or rp information
* until we are sure we can commit to a new buffer.
dest_map->skb = src_map->skb;
pci_unmap_addr_set(dest_map, mapping,
dest_map->skb = src_map->skb;
pci_unmap_addr_set(dest_map, mapping,
}
if (kind == RESET_KIND_INIT ||
}
if (kind == RESET_KIND_INIT ||
}
if (kind == RESET_KIND_SHUTDOWN)
}
if (kind == RESET_KIND_SHUTDOWN)
if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)
/* Write our heartbeat update interval to APE. */
if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)
/* Write our heartbeat update interval to APE. */
LED_CTRL_MODE_PHY_2);
break;
LED_CTRL_MODE_PHY_2);
break;
if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) &&
if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||
GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) &&
val |= (DMA_RWCTRL_READ_BNDRY_384_PCIX |
DMA_RWCTRL_WRITE_BNDRY_384_PCIX);
break;
val |= (DMA_RWCTRL_READ_BNDRY_384_PCIX |
DMA_RWCTRL_WRITE_BNDRY_384_PCIX);
break;
} else if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
switch (cacheline_size) {
case 16:
} else if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
switch (cacheline_size) {
case 16:
val &= ~DMA_RWCTRL_WRITE_BNDRY_DISAB_PCIE;
val |= DMA_RWCTRL_WRITE_BNDRY_128_PCIE;
break;
val &= ~DMA_RWCTRL_WRITE_BNDRY_DISAB_PCIE;
val |= DMA_RWCTRL_WRITE_BNDRY_128_PCIE;
break;
} else {
switch (cacheline_size) {
case 16:
} else {
switch (cacheline_size) {
case 16:
val |= (DMA_RWCTRL_READ_BNDRY_1024 |
DMA_RWCTRL_WRITE_BNDRY_1024);
break;
val |= (DMA_RWCTRL_READ_BNDRY_1024 |
DMA_RWCTRL_WRITE_BNDRY_1024);
break;
case PHY_ID_BCM8002: return "8002/serdes";
case 0: return "serdes";
default: return "unknown";
case PHY_ID_BCM8002: return "8002/serdes";
case 0: return "serdes";
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)