aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-27 20:47:26 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-27 20:47:26 -0400
commit7c510e4b730a92cecf94ada45c989d8be0200d47 (patch)
tree61f1926964c580946367588602a8eb039561f077 /drivers
parente174961ca1a0b28f7abf0be47973ad57cb74e5f0 (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')
-rw-r--r--drivers/media/dvb/b2c2/flexcop.c2
-rw-r--r--drivers/media/dvb/bt8xx/dst.c4
-rw-r--r--drivers/media/dvb/dm1105/dm1105.c3
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-dvb.c5
-rw-r--r--drivers/media/dvb/pluto2/pluto2.c3
-rw-r--r--drivers/message/fusion/mptlan.c18
-rw-r--r--drivers/net/bnx2x_main.c7
-rw-r--r--drivers/net/de620.c5
-rw-r--r--drivers/net/e1000e/netdev.c11
-rw-r--r--drivers/net/enic/enic_res.c7
-rw-r--r--drivers/net/enic/vnic_dev.c10
-rw-r--r--drivers/net/fs_enet/fs_enet-main.c5
-rw-r--r--drivers/net/ibm_newemac/core.c11
-rw-r--r--drivers/net/igb/igb_main.c6
-rw-r--r--drivers/net/ioc3-eth.c7
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c6
-rw-r--r--drivers/net/jme.c12
-rw-r--r--drivers/net/ps3_gelic_wireless.c6
-rw-r--r--drivers/net/qlge/qlge_main.c11
-rw-r--r--drivers/net/wireless/wavelan_cs.c8
-rw-r--r--drivers/s390/net/qeth_l2_main.c18
-rw-r--r--drivers/usb/atm/cxacru.c4
-rw-r--r--drivers/usb/atm/usbatm.c5
23 files changed, 47 insertions, 127 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c
index 5f79c8dc383..676413a915b 100644
--- a/drivers/media/dvb/b2c2/flexcop.c
+++ b/drivers/media/dvb/b2c2/flexcop.c
@@ -270,7 +270,7 @@ int flexcop_device_initialize(struct flexcop_device *fc)
270 /* do the MAC address reading after initializing the dvb_adapter */ 270 /* do the MAC address reading after initializing the dvb_adapter */
271 if (fc->get_mac_addr(fc, 0) == 0) { 271 if (fc->get_mac_addr(fc, 0) == 0) {
272 u8 *b = fc->dvb_adapter.proposed_mac; 272 u8 *b = fc->dvb_adapter.proposed_mac;
273 info("MAC address = %02x:%02x:%02x:%02x:%02x:%02x", b[0],b[1],b[2],b[3],b[4],b[5]); 273 info("MAC address = %pM", b);
274 flexcop_set_mac_filter(fc,b); 274 flexcop_set_mac_filter(fc,b);
275 flexcop_mac_filter_ctrl(fc,1); 275 flexcop_mac_filter_ctrl(fc,1);
276 } else 276 } else
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index aa3db57d32d..29e8f1546ab 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -917,9 +917,7 @@ static int dst_get_mac(struct dst_state *state)
917 } 917 }
918 memset(&state->mac_address, '\0', 8); 918 memset(&state->mac_address, '\0', 8);
919 memcpy(&state->mac_address, &state->rxbuffer, 6); 919 memcpy(&state->mac_address, &state->rxbuffer, 6);
920 dprintk(verbose, DST_ERROR, 1, "MAC Address=[%02x:%02x:%02x:%02x:%02x:%02x]", 920 dprintk(verbose, DST_ERROR, 1, "MAC Address=[%pM]", state->mac_address);
921 state->mac_address[0], state->mac_address[1], state->mac_address[2],
922 state->mac_address[4], state->mac_address[5], state->mac_address[6]);
923 921
924 return 0; 922 return 0;
925} 923}
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index 14e627ef646..d15984e599b 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -697,8 +697,7 @@ static void __devinit dm1105dvb_read_mac(struct dm1105dvb *dm1105dvb, u8 *mac)
697 }; 697 };
698 698
699 dm1105_i2c_xfer(&dm1105dvb->i2c_adap, msg , 2); 699 dm1105_i2c_xfer(&dm1105dvb->i2c_adap, msg , 2);
700 dev_info(&dm1105dvb->pdev->dev, "MAC %02x:%02x:%02x:%02x:%02x:%02x\n", 700 dev_info(&dm1105dvb->pdev->dev, "MAC %pM\n", mac);
701 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
702} 701}
703 702
704static int __devinit dm1105_probe(struct pci_dev *pdev, 703static int __devinit dm1105_probe(struct pci_dev *pdev,
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
index ce8cd0c5d83..8a7d87bcd1d 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
@@ -91,10 +91,7 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums)
91 91
92 if (adap->dev->props.read_mac_address) { 92 if (adap->dev->props.read_mac_address) {
93 if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0) 93 if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0)
94 info("MAC address: %02x:%02x:%02x:%02x:%02x:%02x",adap->dvb_adap.proposed_mac[0], 94 info("MAC address: %pM",adap->dvb_adap.proposed_mac);
95 adap->dvb_adap.proposed_mac[1], adap->dvb_adap.proposed_mac[2],
96 adap->dvb_adap.proposed_mac[3], adap->dvb_adap.proposed_mac[4],
97 adap->dvb_adap.proposed_mac[5]);
98 else 95 else
99 err("MAC address reading failed."); 96 err("MAC address reading failed.");
100 } 97 }
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index a9653c63f4d..d101b304e9b 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -560,8 +560,7 @@ static void __devinit pluto_read_mac(struct pluto *pluto, u8 *mac)
560 mac[4] = (val >> 8) & 0xff; 560 mac[4] = (val >> 8) & 0xff;
561 mac[5] = (val >> 0) & 0xff; 561 mac[5] = (val >> 0) & 0xff;
562 562
563 dev_info(&pluto->pdev->dev, "MAC %02x:%02x:%02x:%02x:%02x:%02x\n", 563 dev_info(&pluto->pdev->dev, "MAC %pM\n", mac);
564 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
565} 564}
566 565
567static int __devinit pluto_read_serial(struct pluto *pluto) 566static int __devinit pluto_read_serial(struct pluto *pluto)
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index a1abf95cf75..582a921c7aa 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -1462,11 +1462,9 @@ mptlan_probe(struct pci_dev *pdev, const struct pci_device_id *id)
1462 printk(KERN_INFO MYNAM ": %s: Fusion MPT LAN device " 1462 printk(KERN_INFO MYNAM ": %s: Fusion MPT LAN device "
1463 "registered as '%s'\n", ioc->name, dev->name); 1463 "registered as '%s'\n", ioc->name, dev->name);
1464 printk(KERN_INFO MYNAM ": %s/%s: " 1464 printk(KERN_INFO MYNAM ": %s/%s: "
1465 "LanAddr = %02X:%02X:%02X:%02X:%02X:%02X\n", 1465 "LanAddr = %pM\n",
1466 IOC_AND_NETDEV_NAMES_s_s(dev), 1466 IOC_AND_NETDEV_NAMES_s_s(dev),
1467 dev->dev_addr[0], dev->dev_addr[1], 1467 dev->dev_addr);
1468 dev->dev_addr[2], dev->dev_addr[3],
1469 dev->dev_addr[4], dev->dev_addr[5]);
1470 1468
1471 ioc->netdev = dev; 1469 ioc->netdev = dev;
1472 1470
@@ -1551,9 +1549,8 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev)
1551 1549
1552 printk (KERN_WARNING MYNAM ": %s: WARNING - Broadcast swap F/W bug detected!\n", 1550 printk (KERN_WARNING MYNAM ": %s: WARNING - Broadcast swap F/W bug detected!\n",
1553 NETDEV_PTR_TO_IOC_NAME_s(dev)); 1551 NETDEV_PTR_TO_IOC_NAME_s(dev));
1554 printk (KERN_WARNING MYNAM ": Please update sender @ MAC_addr = %02x:%02x:%02x:%02x:%02x:%02x\n", 1552 printk (KERN_WARNING MYNAM ": Please update sender @ MAC_addr = %pM\n",
1555 fch->saddr[0], fch->saddr[1], fch->saddr[2], 1553 fch->saddr);
1556 fch->saddr[3], fch->saddr[4], fch->saddr[5]);
1557 } 1554 }
1558 1555
1559 if (*fch->daddr & 1) { 1556 if (*fch->daddr & 1) {
@@ -1628,10 +1625,9 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev)
1628 nh->NAA = source_naa; /* Set the S_NAA value. */ 1625 nh->NAA = source_naa; /* Set the S_NAA value. */
1629 for (i = 0; i < FC_ALEN; i++) 1626 for (i = 0; i < FC_ALEN; i++)
1630 nh->ieee[i] = fch->saddr[i]; 1627 nh->ieee[i] = fch->saddr[i];
1631 dlprintk ((KERN_INFO "Got ARP from %02x:%02x:%02x:%02x:" 1628 dlprintk ((KERN_INFO "Got ARP from %pM with"
1632 "%02x:%02x with non-compliant S_NAA value.\n", 1629 " non-compliant S_NAA value.\n",
1633 fch->saddr[0], fch->saddr[1], fch->saddr[2], 1630 fch->saddr));
1634 fch->saddr[3], fch->saddr[4],fch->saddr[5]));
1635 } else { 1631 } else {
1636 printk (KERN_ERR "mptlan/type_trans: Unable to" 1632 printk (KERN_ERR "mptlan/type_trans: Unable to"
1637 " kmalloc a NAA_Hosed struct.\n"); 1633 " kmalloc a NAA_Hosed struct.\n");
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index b55257f31c7..9cfc941aab0 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -9851,11 +9851,8 @@ static void bnx2x_set_rx_mode(struct net_device *dev)
9851 mclist && (i < dev->mc_count); 9851 mclist && (i < dev->mc_count);
9852 i++, mclist = mclist->next) { 9852 i++, mclist = mclist->next) {
9853 9853
9854 DP(NETIF_MSG_IFUP, "Adding mcast MAC: " 9854 DP(NETIF_MSG_IFUP, "Adding mcast MAC: %pM\n",
9855 "%02x:%02x:%02x:%02x:%02x:%02x\n", 9855 mclist->dmi_addr);
9856 mclist->dmi_addr[0], mclist->dmi_addr[1],
9857 mclist->dmi_addr[2], mclist->dmi_addr[3],
9858 mclist->dmi_addr[4], mclist->dmi_addr[5]);
9859 9856
9860 crc = crc32c_le(0, mclist->dmi_addr, ETH_ALEN); 9857 crc = crc32c_le(0, mclist->dmi_addr, ETH_ALEN);
9861 bit = (crc >> 24) & 0xff; 9858 bit = (crc >> 24) & 0xff;
diff --git a/drivers/net/de620.c b/drivers/net/de620.c
index 254bb4adb6b..643b1ea0841 100644
--- a/drivers/net/de620.c
+++ b/drivers/net/de620.c
@@ -875,10 +875,7 @@ struct net_device * __init de620_probe(int unit)
875 if (de620_debug) { 875 if (de620_debug) {
876 printk("\nEEPROM contents:\n"); 876 printk("\nEEPROM contents:\n");
877 printk("RAM_Size = 0x%02X\n", nic_data.RAM_Size); 877 printk("RAM_Size = 0x%02X\n", nic_data.RAM_Size);
878 printk("NodeID = %02X:%02X:%02X:%02X:%02X:%02X\n", 878 printk("NodeID = %pM\n", nic_data.NodeID);
879 nic_data.NodeID[0], nic_data.NodeID[1],
880 nic_data.NodeID[2], nic_data.NodeID[3],
881 nic_data.NodeID[4], nic_data.NodeID[5]);
882 printk("Model = %d\n", nic_data.Model); 879 printk("Model = %d\n", nic_data.Model);
883 printk("Media = %d\n", nic_data.Media); 880 printk("Media = %d\n", nic_data.Media);
884 printk("SCR = 0x%02x\n", nic_data.SCR); 881 printk("SCR = 0x%02x\n", nic_data.SCR);
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index abd492b7336..a5c9266cd7c 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4652,14 +4652,12 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
4652 u32 pba_num; 4652 u32 pba_num;
4653 4653
4654 /* print bus type/speed/width info */ 4654 /* print bus type/speed/width info */
4655 e_info("(PCI Express:2.5GB/s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n", 4655 e_info("(PCI Express:2.5GB/s:%s) %pM\n",
4656 /* bus width */ 4656 /* bus width */
4657 ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" : 4657 ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
4658 "Width x1"), 4658 "Width x1"),
4659 /* MAC address */ 4659 /* MAC address */
4660 netdev->dev_addr[0], netdev->dev_addr[1], 4660 netdev->dev_addr);
4661 netdev->dev_addr[2], netdev->dev_addr[3],
4662 netdev->dev_addr[4], netdev->dev_addr[5]);
4663 e_info("Intel(R) PRO/%s Network Connection\n", 4661 e_info("Intel(R) PRO/%s Network Connection\n",
4664 (hw->phy.type == e1000_phy_ife) ? "10/100" : "1000"); 4662 (hw->phy.type == e1000_phy_ife) ? "10/100" : "1000");
4665 e1000e_read_pba_num(hw, &pba_num); 4663 e1000e_read_pba_num(hw, &pba_num);
@@ -4906,10 +4904,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
4906 memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len); 4904 memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
4907 4905
4908 if (!is_valid_ether_addr(netdev->perm_addr)) { 4906 if (!is_valid_ether_addr(netdev->perm_addr)) {
4909 e_err("Invalid MAC Address: %02x:%02x:%02x:%02x:%02x:%02x\n", 4907 e_err("Invalid MAC Address: %pM\n", netdev->perm_addr);
4910 netdev->perm_addr[0], netdev->perm_addr[1],
4911 netdev->perm_addr[2], netdev->perm_addr[3],
4912 netdev->perm_addr[4], netdev->perm_addr[5]);
4913 err = -EIO; 4908 err = -EIO;
4914 goto err_eeprom; 4909 goto err_eeprom;
4915 } 4910 }
diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c
index 95184b9108e..e5fc9384f8f 100644
--- a/drivers/net/enic/enic_res.c
+++ b/drivers/net/enic/enic_res.c
@@ -90,11 +90,8 @@ int enic_get_vnic_config(struct enic *enic)
90 90
91 c->intr_timer = min_t(u16, VNIC_INTR_TIMER_MAX, c->intr_timer); 91 c->intr_timer = min_t(u16, VNIC_INTR_TIMER_MAX, c->intr_timer);
92 92
93 printk(KERN_INFO PFX "vNIC MAC addr %02x:%02x:%02x:%02x:%02x:%02x " 93 printk(KERN_INFO PFX "vNIC MAC addr %pM wq/rq %d/%d\n",
94 "wq/rq %d/%d\n", 94 enic->mac_addr, c->wq_desc_count, c->rq_desc_count);
95 enic->mac_addr[0], enic->mac_addr[1], enic->mac_addr[2],
96 enic->mac_addr[3], enic->mac_addr[4], enic->mac_addr[5],
97 c->wq_desc_count, c->rq_desc_count);
98 printk(KERN_INFO PFX "vNIC mtu %d csum tx/rx %d/%d tso/lro %d/%d " 95 printk(KERN_INFO PFX "vNIC mtu %d csum tx/rx %d/%d tso/lro %d/%d "
99 "intr timer %d\n", 96 "intr timer %d\n",
100 c->mtu, ENIC_SETTING(enic, TXCSUM), 97 c->mtu, ENIC_SETTING(enic, TXCSUM),
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c
index 4d104f5c30f..9afd33c7188 100644
--- a/drivers/net/enic/vnic_dev.c
+++ b/drivers/net/enic/vnic_dev.c
@@ -489,10 +489,7 @@ void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
489 489
490 err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait); 490 err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);
491 if (err) 491 if (err)
492 printk(KERN_ERR 492 printk(KERN_ERR "Can't add addr [%pM], %d\n", addr, err);
493 "Can't add addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n",
494 addr[0], addr[1], addr[2], addr[3], addr[4], addr[5],
495 err);
496} 493}
497 494
498void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr) 495void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
@@ -507,10 +504,7 @@ void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
507 504
508 err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait); 505 err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait);
509 if (err) 506 if (err)
510 printk(KERN_ERR 507 printk(KERN_ERR "Can't del addr [%pM], %d\n", addr, err);
511 "Can't del addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n",
512 addr[0], addr[1], addr[2], addr[3], addr[4], addr[5],
513 err);
514} 508}
515 509
516int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr) 510int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index cb51c1fb033..e32f08d18c6 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -1115,10 +1115,7 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
1115 if (ret) 1115 if (ret)
1116 goto out_free_bd; 1116 goto out_free_bd;
1117 1117
1118 printk(KERN_INFO "%s: fs_enet: %02x:%02x:%02x:%02x:%02x:%02x\n", 1118 printk(KERN_INFO "%s: fs_enet: %pM\n", ndev->name, ndev->dev_addr);
1119 ndev->name,
1120 ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2],
1121 ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]);
1122 1119
1123 return 0; 1120 return 0;
1124 1121
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 2ee2622258f..1232ef9fb9e 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -396,9 +396,7 @@ static void emac_hash_mc(struct emac_instance *dev)
396 396
397 for (dmi = dev->ndev->mc_list; dmi; dmi = dmi->next) { 397 for (dmi = dev->ndev->mc_list; dmi; dmi = dmi->next) {
398 int slot, reg, mask; 398 int slot, reg, mask;
399 DBG2(dev, "mc %02x:%02x:%02x:%02x:%02x:%02x" NL, 399 DBG2(dev, "mc %pM" NL, dmi->dmi_addr);
400 dmi->dmi_addr[0], dmi->dmi_addr[1], dmi->dmi_addr[2],
401 dmi->dmi_addr[3], dmi->dmi_addr[4], dmi->dmi_addr[5]);
402 400
403 slot = EMAC_XAHT_CRC_TO_SLOT(dev, ether_crc(ETH_ALEN, dmi->dmi_addr)); 401 slot = EMAC_XAHT_CRC_TO_SLOT(dev, ether_crc(ETH_ALEN, dmi->dmi_addr));
404 reg = EMAC_XAHT_SLOT_TO_REG(dev, slot); 402 reg = EMAC_XAHT_SLOT_TO_REG(dev, slot);
@@ -2865,11 +2863,8 @@ static int __devinit emac_probe(struct of_device *ofdev,
2865 wake_up_all(&emac_probe_wait); 2863 wake_up_all(&emac_probe_wait);
2866 2864
2867 2865
2868 printk(KERN_INFO 2866 printk(KERN_INFO "%s: EMAC-%d %s, MAC %pM\n",
2869 "%s: EMAC-%d %s, MAC %02x:%02x:%02x:%02x:%02x:%02x\n", 2867 ndev->name, dev->cell_index, np->full_name, ndev->dev_addr);
2870 ndev->name, dev->cell_index, np->full_name,
2871 ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2],
2872 ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]);
2873 2868
2874 if (dev->phy_mode == PHY_MODE_SGMII) 2869 if (dev->phy_mode == PHY_MODE_SGMII)
2875 printk(KERN_NOTICE "%s: in SGMII mode\n", ndev->name); 2870 printk(KERN_NOTICE "%s: in SGMII mode\n", ndev->name);
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 1f397cd9941..3b42665ef1d 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1275,16 +1275,14 @@ static int __devinit igb_probe(struct pci_dev *pdev,
1275 1275
1276 dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n"); 1276 dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n");
1277 /* print bus type/speed/width info */ 1277 /* print bus type/speed/width info */
1278 dev_info(&pdev->dev, 1278 dev_info(&pdev->dev, "%s: (PCIe:%s:%s) %pM\n",
1279 "%s: (PCIe:%s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n",
1280 netdev->name, 1279 netdev->name,
1281 ((hw->bus.speed == e1000_bus_speed_2500) 1280 ((hw->bus.speed == e1000_bus_speed_2500)
1282 ? "2.5Gb/s" : "unknown"), 1281 ? "2.5Gb/s" : "unknown"),
1283 ((hw->bus.width == e1000_bus_width_pcie_x4) 1282 ((hw->bus.width == e1000_bus_width_pcie_x4)
1284 ? "Width x4" : (hw->bus.width == e1000_bus_width_pcie_x1) 1283 ? "Width x4" : (hw->bus.width == e1000_bus_width_pcie_x1)
1285 ? "Width x1" : "unknown"), 1284 ? "Width x1" : "unknown"),
1286 netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2], 1285 netdev->dev_addr);
1287 netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
1288 1286
1289 igb_read_part_num(hw, &part_num); 1287 igb_read_part_num(hw, &part_num);
1290 dev_info(&pdev->dev, "%s: PBA No: %06x-%03x\n", netdev->name, 1288 dev_info(&pdev->dev, "%s: PBA No: %06x-%03x\n", netdev->name,
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 9803af1f0f5..afac65e4677 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -390,11 +390,8 @@ static int nic_init(struct ioc3 *ioc3)
390 } 390 }
391 391
392 printk("Found %s NIC", type); 392 printk("Found %s NIC", type);
393 if (type != unknown) { 393 if (type != unknown)
394 printk (" registration number %02x:%02x:%02x:%02x:%02x:%02x," 394 printk (" registration number %pM, CRC %02x", serial, crc);
395 " CRC %02x", serial[0], serial[1], serial[2],
396 serial[3], serial[4], serial[5], crc);
397 }
398 printk(".\n"); 395 printk(".\n");
399 396
400 return 0; 397 return 0;
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 7548fb7360d..028bfb20412 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,
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 81c6cdc3851..a10c68700e0 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -2862,18 +2862,10 @@ jme_init_one(struct pci_dev *pdev,
2862 goto err_out_free_shadow; 2862 goto err_out_free_shadow;
2863 } 2863 }
2864 2864
2865 msg_probe(jme, 2865 msg_probe(jme, "JMC250 gigabit%s ver:%x rev:%x macaddr:%pM\n",
2866 "JMC250 gigabit%s ver:%x rev:%x "
2867 "macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
2868 (jme->fpgaver != 0) ? " (FPGA)" : "", 2866 (jme->fpgaver != 0) ? " (FPGA)" : "",
2869 (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev, 2867 (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev,
2870 jme->rev, 2868 jme->rev, netdev->dev_addr);
2871 netdev->dev_addr[0],
2872 netdev->dev_addr[1],
2873 netdev->dev_addr[2],
2874 netdev->dev_addr[3],
2875 netdev->dev_addr[4],
2876 netdev->dev_addr[5]);
2877 2869
2878 return 0; 2870 return 0;
2879 2871
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index c1eaeb61415..d10dc3ea9c7 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -1165,11 +1165,7 @@ static int gelic_wl_set_ap(struct net_device *netdev,
1165 ETH_ALEN); 1165 ETH_ALEN);
1166 set_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat); 1166 set_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat);
1167 set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat); 1167 set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat);
1168 pr_debug("%s: bss=%02x:%02x:%02x:%02x:%02x:%02x\n", 1168 pr_debug("%s: bss=%pM\n", __func__, wl->bssid);
1169 __func__,
1170 wl->bssid[0], wl->bssid[1],
1171 wl->bssid[2], wl->bssid[3],
1172 wl->bssid[4], wl->bssid[5]);
1173 } else { 1169 } else {
1174 pr_debug("%s: clear bssid\n", __func__); 1170 pr_debug("%s: clear bssid\n", __func__);
1175 clear_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat); 1171 clear_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat);
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index b83a9c9b6a9..6445d2cb132 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -336,12 +336,11 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
336 (addr[5]); 336 (addr[5]);
337 337
338 QPRINTK(qdev, IFUP, INFO, 338 QPRINTK(qdev, IFUP, INFO,
339 "Adding %s address %02x:%02x:%02x:%02x:%02x:%02x" 339 "Adding %s address %pM"
340 " at index %d in the CAM.\n", 340 " at index %d in the CAM.\n",
341 ((type == 341 ((type ==
342 MAC_ADDR_TYPE_MULTI_MAC) ? "MULTICAST" : 342 MAC_ADDR_TYPE_MULTI_MAC) ? "MULTICAST" :
343 "UNICAST"), addr[0], addr[1], addr[2], addr[3], 343 "UNICAST"), addr, index);
344 addr[4], addr[5], index);
345 344
346 status = 345 status =
347 ql_wait_reg_rdy(qdev, 346 ql_wait_reg_rdy(qdev,
@@ -3127,11 +3126,7 @@ static void ql_display_dev_info(struct net_device *ndev)
3127 qdev->chip_rev_id >> 4 & 0x0000000f, 3126 qdev->chip_rev_id >> 4 & 0x0000000f,
3128 qdev->chip_rev_id >> 8 & 0x0000000f, 3127 qdev->chip_rev_id >> 8 & 0x0000000f,
3129 qdev->chip_rev_id >> 12 & 0x0000000f); 3128 qdev->chip_rev_id >> 12 & 0x0000000f);
3130 QPRINTK(qdev, PROBE, INFO, 3129 QPRINTK(qdev, PROBE, INFO, "MAC address %pM\n", ndev->dev_addr);
3131 "MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",
3132 ndev->dev_addr[0], ndev->dev_addr[1],
3133 ndev->dev_addr[2], ndev->dev_addr[3], ndev->dev_addr[4],
3134 ndev->dev_addr[5]);
3135} 3130}
3136 3131
3137static int ql_adapter_down(struct ql_adapter *qdev) 3132static int ql_adapter_down(struct ql_adapter *qdev)
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 7bf445895a8..0a3bacc20d9 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -2235,13 +2235,7 @@ static int wavelan_set_wap(struct net_device *dev,
2235 char *extra) 2235 char *extra)
2236{ 2236{
2237#ifdef DEBUG_IOCTL_INFO 2237#ifdef DEBUG_IOCTL_INFO
2238 printk(KERN_DEBUG "Set AP to : %02X:%02X:%02X:%02X:%02X:%02X\n", 2238 printk(KERN_DEBUG "Set AP to : %pM\n", wrqu->ap_addr.sa_data);
2239 wrqu->ap_addr.sa_data[0],
2240 wrqu->ap_addr.sa_data[1],
2241 wrqu->ap_addr.sa_data[2],
2242 wrqu->ap_addr.sa_data[3],
2243 wrqu->ap_addr.sa_data[4],
2244 wrqu->ap_addr.sa_data[5]);
2245#endif /* DEBUG_IOCTL_INFO */ 2239#endif /* DEBUG_IOCTL_INFO */
2246 2240
2247 return -EOPNOTSUPP; 2241 return -EOPNOTSUPP;
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 955ba7a31b9..18623ef0128 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -131,17 +131,13 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card,
131 mac = &cmd->data.setdelmac.mac[0]; 131 mac = &cmd->data.setdelmac.mac[0];
132 /* MAC already registered, needed in couple/uncouple case */ 132 /* MAC already registered, needed in couple/uncouple case */
133 if (cmd->hdr.return_code == 0x2005) { 133 if (cmd->hdr.return_code == 0x2005) {
134 QETH_DBF_MESSAGE(2, "Group MAC %02x:%02x:%02x:%02x:%02x:%02x " 134 QETH_DBF_MESSAGE(2, "Group MAC %pM already existing on %s \n",
135 "already existing on %s \n", 135 mac, QETH_CARD_IFNAME(card));
136 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
137 QETH_CARD_IFNAME(card));
138 cmd->hdr.return_code = 0; 136 cmd->hdr.return_code = 0;
139 } 137 }
140 if (cmd->hdr.return_code) 138 if (cmd->hdr.return_code)
141 QETH_DBF_MESSAGE(2, "Could not set group MAC " 139 QETH_DBF_MESSAGE(2, "Could not set group MAC %pM on %s: %x\n",
142 "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n", 140 mac, QETH_CARD_IFNAME(card), cmd->hdr.return_code);
143 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
144 QETH_CARD_IFNAME(card), cmd->hdr.return_code);
145 return 0; 141 return 0;
146} 142}
147 143
@@ -163,10 +159,8 @@ static int qeth_l2_send_delgroupmac_cb(struct qeth_card *card,
163 cmd = (struct qeth_ipa_cmd *) data; 159 cmd = (struct qeth_ipa_cmd *) data;
164 mac = &cmd->data.setdelmac.mac[0]; 160 mac = &cmd->data.setdelmac.mac[0];
165 if (cmd->hdr.return_code) 161 if (cmd->hdr.return_code)
166 QETH_DBF_MESSAGE(2, "Could not delete group MAC " 162 QETH_DBF_MESSAGE(2, "Could not delete group MAC %pM on %s: %x\n",
167 "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n", 163 mac, QETH_CARD_IFNAME(card), cmd->hdr.return_code);
168 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
169 QETH_CARD_IFNAME(card), cmd->hdr.return_code);
170 return 0; 164 return 0;
171} 165}
172 166
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index 9aea43a8c4a..5ed4ae07bac 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -286,9 +286,7 @@ static ssize_t cxacru_sysfs_show_mac_address(struct device *dev,
286 struct usbatm_data *usbatm_instance = usb_get_intfdata(intf); 286 struct usbatm_data *usbatm_instance = usb_get_intfdata(intf);
287 struct atm_dev *atm_dev = usbatm_instance->atm_dev; 287 struct atm_dev *atm_dev = usbatm_instance->atm_dev;
288 288
289 return snprintf(buf, PAGE_SIZE, "%02x:%02x:%02x:%02x:%02x:%02x\n", 289 return snprintf(buf, PAGE_SIZE, "%pM\n", atm_dev->esi);
290 atm_dev->esi[0], atm_dev->esi[1], atm_dev->esi[2],
291 atm_dev->esi[3], atm_dev->esi[4], atm_dev->esi[5]);
292} 290}
293 291
294static ssize_t cxacru_sysfs_show_adsl_state(struct device *dev, 292static ssize_t cxacru_sysfs_show_adsl_state(struct device *dev,
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index 06dd114910d..fbea8563df1 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -770,10 +770,7 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
770 return sprintf(page, "%s\n", instance->description); 770 return sprintf(page, "%s\n", instance->description);
771 771
772 if (!left--) 772 if (!left--)
773 return sprintf(page, "MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", 773 return sprintf(page, "MAC: %pM\n", atm_dev->esi);
774 atm_dev->esi[0], atm_dev->esi[1],
775 atm_dev->esi[2], atm_dev->esi[3],
776 atm_dev->esi[4], atm_dev->esi[5]);
777 774
778 if (!left--) 775 if (!left--)
779 return sprintf(page, 776 return sprintf(page,
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-17 11:43:05 -0400