diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 18:59:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:06:18 -0400 |
commit | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch) | |
tree | e8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/tulip/tulip_core.c | |
parent | 0c68ae2605dbcf67414d8d1f19af93be44b355fb (diff) |
net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were
a few things that had conflicts which I have just dropped for
now, no harm done.
I've built an allyesconfig with this and looked at the files
that weren't built very carefully, but it's a huge patch.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tulip/tulip_core.c')
-rw-r--r-- | drivers/net/tulip/tulip_core.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index cafa89e60167..1c5ef230b770 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
@@ -1050,13 +1050,11 @@ static void set_rx_mode(struct net_device *dev) | |||
1050 | filterbit = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; | 1050 | filterbit = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; |
1051 | filterbit &= 0x3f; | 1051 | filterbit &= 0x3f; |
1052 | mc_filter[filterbit >> 5] |= 1 << (filterbit & 31); | 1052 | mc_filter[filterbit >> 5] |= 1 << (filterbit & 31); |
1053 | if (tulip_debug > 2) { | 1053 | if (tulip_debug > 2) |
1054 | DECLARE_MAC_BUF(mac); | 1054 | printk(KERN_INFO "%s: Added filter for %pM" |
1055 | printk(KERN_INFO "%s: Added filter for %s" | ||
1056 | " %8.8x bit %d.\n", | 1055 | " %8.8x bit %d.\n", |
1057 | dev->name, print_mac(mac, mclist->dmi_addr), | 1056 | dev->name, mclist->dmi_addr, |
1058 | ether_crc(ETH_ALEN, mclist->dmi_addr), filterbit); | 1057 | ether_crc(ETH_ALEN, mclist->dmi_addr), filterbit); |
1059 | } | ||
1060 | } | 1058 | } |
1061 | if (mc_filter[0] == tp->mc_filter[0] && | 1059 | if (mc_filter[0] == tp->mc_filter[0] && |
1062 | mc_filter[1] == tp->mc_filter[1]) | 1060 | mc_filter[1] == tp->mc_filter[1]) |
@@ -1250,7 +1248,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, | |||
1250 | const char *chip_name = tulip_tbl[chip_idx].chip_name; | 1248 | const char *chip_name = tulip_tbl[chip_idx].chip_name; |
1251 | unsigned int eeprom_missing = 0; | 1249 | unsigned int eeprom_missing = 0; |
1252 | unsigned int force_csr0 = 0; | 1250 | unsigned int force_csr0 = 0; |
1253 | DECLARE_MAC_BUF(mac); | ||
1254 | 1251 | ||
1255 | #ifndef MODULE | 1252 | #ifndef MODULE |
1256 | static int did_version; /* Already printed version info. */ | 1253 | static int did_version; /* Already printed version info. */ |
@@ -1635,7 +1632,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, | |||
1635 | 1632 | ||
1636 | if (eeprom_missing) | 1633 | if (eeprom_missing) |
1637 | printk(" EEPROM not present,"); | 1634 | printk(" EEPROM not present,"); |
1638 | printk(" %s", print_mac(mac, dev->dev_addr)); | 1635 | printk(" %pM", dev->dev_addr); |
1639 | printk(", IRQ %d.\n", irq); | 1636 | printk(", IRQ %d.\n", irq); |
1640 | 1637 | ||
1641 | if (tp->chip_id == PNIC2) | 1638 | if (tp->chip_id == PNIC2) |