diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 20:47:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:47:26 -0400 |
commit | 7c510e4b730a92cecf94ada45c989d8be0200d47 (patch) | |
tree | 61f1926964c580946367588602a8eb039561f077 /drivers/net/ixgbe/ixgbe_main.c | |
parent | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (diff) |
net: convert more to %pM
A number of places still use %02x:...:%02x because it's
in debug statements or for no real reason. Make a few
of them use %pM.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 7548fb7360d9..028bfb20412c 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -3877,8 +3877,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
3877 | pci_read_config_word(pdev, IXGBE_PCI_LINK_STATUS, &link_status); | 3877 | pci_read_config_word(pdev, IXGBE_PCI_LINK_STATUS, &link_status); |
3878 | link_speed = link_status & IXGBE_PCI_LINK_SPEED; | 3878 | link_speed = link_status & IXGBE_PCI_LINK_SPEED; |
3879 | link_width = link_status & IXGBE_PCI_LINK_WIDTH; | 3879 | link_width = link_status & IXGBE_PCI_LINK_WIDTH; |
3880 | dev_info(&pdev->dev, "(PCI Express:%s:%s) " | 3880 | dev_info(&pdev->dev, "(PCI Express:%s:%s) %pM\n", |
3881 | "%02x:%02x:%02x:%02x:%02x:%02x\n", | ||
3882 | ((link_speed == IXGBE_PCI_LINK_SPEED_5000) ? "5.0Gb/s" : | 3881 | ((link_speed == IXGBE_PCI_LINK_SPEED_5000) ? "5.0Gb/s" : |
3883 | (link_speed == IXGBE_PCI_LINK_SPEED_2500) ? "2.5Gb/s" : | 3882 | (link_speed == IXGBE_PCI_LINK_SPEED_2500) ? "2.5Gb/s" : |
3884 | "Unknown"), | 3883 | "Unknown"), |
@@ -3887,8 +3886,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
3887 | (link_width == IXGBE_PCI_LINK_WIDTH_2) ? "Width x2" : | 3886 | (link_width == IXGBE_PCI_LINK_WIDTH_2) ? "Width x2" : |
3888 | (link_width == IXGBE_PCI_LINK_WIDTH_1) ? "Width x1" : | 3887 | (link_width == IXGBE_PCI_LINK_WIDTH_1) ? "Width x1" : |
3889 | "Unknown"), | 3888 | "Unknown"), |
3890 | netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2], | 3889 | netdev->dev_addr); |
3891 | netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]); | ||
3892 | ixgbe_read_pba_num_generic(hw, &part_num); | 3890 | ixgbe_read_pba_num_generic(hw, &part_num); |
3893 | dev_info(&pdev->dev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n", | 3891 | dev_info(&pdev->dev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n", |
3894 | hw->mac.type, hw->phy.type, | 3892 | hw->mac.type, hw->phy.type, |