diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2008-11-03 19:52:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-03 19:52:56 -0500 |
commit | df59c9403557397aafbe291533d113b752da7661 (patch) | |
tree | 929a2af54ebf28c1548892f45de908a4c121c231 /drivers | |
parent | b2b98d4acc58a6f36b731e666c6ebd901cd6a27e (diff) |
tg3: Move phylib report to end of tg3_init_one
Currently, phylib reports appear with a eth%d prefix. Move the line
after register_netdev() and place it alongside the other informative
messages. Update nearby informative messages accordingly.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/tg3.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 978d1f0ccb7d..aebc645a3b51 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -1360,10 +1360,6 @@ static int tg3_phy_init(struct tg3 *tp) | |||
1360 | 1360 | ||
1361 | phydev->advertising = phydev->supported; | 1361 | phydev->advertising = phydev->supported; |
1362 | 1362 | ||
1363 | printk(KERN_INFO | ||
1364 | "%s: attached PHY driver [%s] (mii_bus:phy_addr=%s)\n", | ||
1365 | tp->dev->name, phydev->drv->name, phydev->dev.bus_id); | ||
1366 | |||
1367 | return 0; | 1363 | return 0; |
1368 | } | 1364 | } |
1369 | 1365 | ||
@@ -13547,26 +13543,34 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, | |||
13547 | goto err_out_apeunmap; | 13543 | goto err_out_apeunmap; |
13548 | } | 13544 | } |
13549 | 13545 | ||
13550 | printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] " | 13546 | printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x] (%s) MAC address %pM\n", |
13551 | "(%s) %s Ethernet %pM\n", | ||
13552 | dev->name, | 13547 | dev->name, |
13553 | tp->board_part_number, | 13548 | tp->board_part_number, |
13554 | tp->pci_chip_rev_id, | 13549 | tp->pci_chip_rev_id, |
13555 | tg3_phy_string(tp), | ||
13556 | tg3_bus_string(tp, str), | 13550 | tg3_bus_string(tp, str), |
13557 | ((tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100Base-TX" : | ||
13558 | ((tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) ? "1000Base-SX" : | ||
13559 | "10/100/1000Base-T")), | ||
13560 | dev->dev_addr); | 13551 | dev->dev_addr); |
13561 | 13552 | ||
13562 | printk(KERN_INFO "%s: RXcsums[%d] LinkChgREG[%d] " | 13553 | if (tp->tg3_flags3 & TG3_FLG3_PHY_CONNECTED) |
13563 | "MIirq[%d] ASF[%d] WireSpeed[%d] TSOcap[%d]\n", | 13554 | printk(KERN_INFO |
13555 | "%s: attached PHY driver [%s] (mii_bus:phy_addr=%s)\n", | ||
13556 | tp->dev->name, | ||
13557 | tp->mdio_bus->phy_map[PHY_ADDR]->drv->name, | ||
13558 | tp->mdio_bus->phy_map[PHY_ADDR]->dev.bus_id); | ||
13559 | else | ||
13560 | printk(KERN_INFO | ||
13561 | "%s: attached PHY is %s (%s Ethernet) (WireSpeed[%d])\n", | ||
13562 | tp->dev->name, tg3_phy_string(tp), | ||
13563 | ((tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100Base-TX" : | ||
13564 | ((tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) ? "1000Base-SX" : | ||
13565 | "10/100/1000Base-T")), | ||
13566 | (tp->tg3_flags2 & TG3_FLG2_NO_ETH_WIRE_SPEED) == 0); | ||
13567 | |||
13568 | printk(KERN_INFO "%s: RXcsums[%d] LinkChgREG[%d] MIirq[%d] ASF[%d] TSOcap[%d]\n", | ||
13564 | dev->name, | 13569 | dev->name, |
13565 | (tp->tg3_flags & TG3_FLAG_RX_CHECKSUMS) != 0, | 13570 | (tp->tg3_flags & TG3_FLAG_RX_CHECKSUMS) != 0, |
13566 | (tp->tg3_flags & TG3_FLAG_USE_LINKCHG_REG) != 0, | 13571 | (tp->tg3_flags & TG3_FLAG_USE_LINKCHG_REG) != 0, |
13567 | (tp->tg3_flags & TG3_FLAG_USE_MI_INTERRUPT) != 0, | 13572 | (tp->tg3_flags & TG3_FLAG_USE_MI_INTERRUPT) != 0, |
13568 | (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) != 0, | 13573 | (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) != 0, |
13569 | (tp->tg3_flags2 & TG3_FLG2_NO_ETH_WIRE_SPEED) == 0, | ||
13570 | (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) != 0); | 13574 | (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) != 0); |
13571 | printk(KERN_INFO "%s: dma_rwctrl[%08x] dma_mask[%d-bit]\n", | 13575 | printk(KERN_INFO "%s: dma_rwctrl[%08x] dma_mask[%d-bit]\n", |
13572 | dev->name, tp->dma_rwctrl, | 13576 | dev->name, tp->dma_rwctrl, |