TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: convert print_mac to %pM

Browse Source 
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>
This commit is contained in:
Johannes Berg
2008-10-27 15:59:26 -07:00
committed by David S. Miller
parent 0c68ae2605
commit e174961ca1
235 changed files with 891 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/mach-ixp4xx/fsg-setup.c
+4 -5
View File
@@ -177,7 +177,6 @@ static irqreturn_t fsg_reset_handler(int irq, void *dev_id)
static void __init fsg_init(void) static void __init fsg_init(void)
{ {
DECLARE_MAC_BUF(mac_buf);
uint8_t __iomem *f; uint8_t __iomem *f;
ixp4xx_sys_init(); ixp4xx_sys_init();
@@ -256,10 +255,10 @@ static void __init fsg_init(void)
#endif #endif
iounmap(f); iounmap(f);
} }
printk(KERN_INFO "FSG: Using MAC address %s for port 0\n", printk(KERN_INFO "FSG: Using MAC address %pM for port 0\n",
print_mac(mac_buf, fsg_plat_eth[0].hwaddr)); fsg_plat_eth[0].hwaddr);
printk(KERN_INFO "FSG: Using MAC address %s for port 1\n", printk(KERN_INFO "FSG: Using MAC address %pM for port 1\n",
print_mac(mac_buf, fsg_plat_eth[1].hwaddr)); fsg_plat_eth[1].hwaddr);
} }
arch/arm/mach-ixp4xx/nas100d-setup.c
+2 -3
View File
@@ -231,7 +231,6 @@ static irqreturn_t nas100d_reset_handler(int irq, void *dev_id)
static void __init nas100d_init(void) static void __init nas100d_init(void)
{ {
DECLARE_MAC_BUF(mac_buf);
uint8_t __iomem *f; uint8_t __iomem *f;
int i; int i;
@@ -294,8 +293,8 @@ static void __init nas100d_init(void)
#endif #endif
iounmap(f); iounmap(f);
} }
printk(KERN_INFO "NAS100D: Using MAC address %s for port 0\n", printk(KERN_INFO "NAS100D: Using MAC address %pM for port 0\n",
print_mac(mac_buf, nas100d_plat_eth[0].hwaddr)); nas100d_plat_eth[0].hwaddr);
} }
arch/arm/mach-ixp4xx/nslu2-setup.c
+2 -3
View File
@@ -220,7 +220,6 @@ static struct sys_timer nslu2_timer = {
static void __init nslu2_init(void) static void __init nslu2_init(void)
{ {
DECLARE_MAC_BUF(mac_buf);
uint8_t __iomem *f; uint8_t __iomem *f;
int i; int i;
@@ -275,8 +274,8 @@ static void __init nslu2_init(void)
#endif #endif
iounmap(f); iounmap(f);
} }
printk(KERN_INFO "NSLU2: Using MAC address %s for port 0\n", printk(KERN_INFO "NSLU2: Using MAC address %pM for port 0\n",
print_mac(mac_buf, nslu2_plat_eth[0].hwaddr)); nslu2_plat_eth[0].hwaddr);
} }
drivers/infiniband/hw/nes/nes.c
+2 -4
View File
@@ -356,10 +356,8 @@ struct ib_qp *nes_get_qp(struct ib_device *device, int qpn)
*/ */
static void nes_print_macaddr(struct net_device *netdev) static void nes_print_macaddr(struct net_device *netdev)
{ {
DECLARE_MAC_BUF(mac); nes_debug(NES_DBG_INIT, "%s: %pM, IRQ %u\n",
netdev->name, netdev->dev_addr, netdev->irq);
nes_debug(NES_DBG_INIT, "%s: %s, IRQ %u\n",
netdev->name, print_mac(mac, netdev->dev_addr), netdev->irq);
} }
/** /**
drivers/infiniband/hw/nes/nes_cm.c
+4 -6
View File
@@ -1027,7 +1027,6 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip)
struct flowi fl; struct flowi fl;
struct neighbour *neigh; struct neighbour *neigh;
int rc = -1; int rc = -1;
DECLARE_MAC_BUF(mac);
memset(&fl, 0, sizeof fl); memset(&fl, 0, sizeof fl);
fl.nl_u.ip4_u.daddr = htonl(dst_ip); fl.nl_u.ip4_u.daddr = htonl(dst_ip);
@@ -1041,8 +1040,8 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip)
if (neigh) { if (neigh) {
if (neigh->nud_state & NUD_VALID) { if (neigh->nud_state & NUD_VALID) {
nes_debug(NES_DBG_CM, "Neighbor MAC address for 0x%08X" nes_debug(NES_DBG_CM, "Neighbor MAC address for 0x%08X"
" is %s, Gateway is 0x%08X \n", dst_ip, " is %pM, Gateway is 0x%08X \n", dst_ip,
print_mac(mac, neigh->ha), ntohl(rt->rt_gateway)); neigh->ha, ntohl(rt->rt_gateway));
nes_manage_arp_cache(nesvnic->netdev, neigh->ha, nes_manage_arp_cache(nesvnic->netdev, neigh->ha,
dst_ip, NES_ARP_ADD); dst_ip, NES_ARP_ADD);
rc = nes_arp_table(nesvnic->nesdev, dst_ip, NULL, rc = nes_arp_table(nesvnic->nesdev, dst_ip, NULL,
@@ -1071,7 +1070,6 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
int arpindex = 0; int arpindex = 0;
struct nes_device *nesdev; struct nes_device *nesdev;
struct nes_adapter *nesadapter; struct nes_adapter *nesadapter;
DECLARE_MAC_BUF(mac);
/* create an hte and cm_node for this instance */ /* create an hte and cm_node for this instance */
cm_node = kzalloc(sizeof(*cm_node), GFP_ATOMIC); cm_node = kzalloc(sizeof(*cm_node), GFP_ATOMIC);
@@ -1137,8 +1135,8 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
/* copy the mac addr to node context */ /* copy the mac addr to node context */
memcpy(cm_node->rem_mac, nesadapter->arp_table[arpindex].mac_addr, ETH_ALEN); memcpy(cm_node->rem_mac, nesadapter->arp_table[arpindex].mac_addr, ETH_ALEN);
nes_debug(NES_DBG_CM, "Remote mac addr from arp table: %s\n", nes_debug(NES_DBG_CM, "Remote mac addr from arp table: %pM\n",
print_mac(mac, cm_node->rem_mac)); cm_node->rem_mac);
add_hte_node(cm_core, cm_node); add_hte_node(cm_core, cm_node);
atomic_inc(&cm_nodes_created); atomic_inc(&cm_nodes_created);
drivers/infiniband/hw/nes/nes_nic.c
+4 -6
View File
@@ -797,14 +797,13 @@ static int nes_netdev_set_mac_address(struct net_device *netdev, void *p)
int i; int i;
u32 macaddr_low; u32 macaddr_low;
u16 macaddr_high; u16 macaddr_high;
DECLARE_MAC_BUF(mac);
if (!is_valid_ether_addr(mac_addr->sa_data)) if (!is_valid_ether_addr(mac_addr->sa_data))
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
memcpy(netdev->dev_addr, mac_addr->sa_data, netdev->addr_len); memcpy(netdev->dev_addr, mac_addr->sa_data, netdev->addr_len);
printk(PFX "%s: Address length = %d, Address = %s\n", printk(PFX "%s: Address length = %d, Address = %pM\n",
__func__, netdev->addr_len, print_mac(mac, mac_addr->sa_data)); __func__, netdev->addr_len, mac_addr->sa_data);
macaddr_high = ((u16)netdev->dev_addr[0]) << 8; macaddr_high = ((u16)netdev->dev_addr[0]) << 8;
macaddr_high += (u16)netdev->dev_addr[1]; macaddr_high += (u16)netdev->dev_addr[1];
macaddr_low = ((u32)netdev->dev_addr[2]) << 24; macaddr_low = ((u32)netdev->dev_addr[2]) << 24;
@@ -909,9 +908,8 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)
if (mc_index >= max_pft_entries_avaiable) if (mc_index >= max_pft_entries_avaiable)
break; break;
if (multicast_addr) { if (multicast_addr) {
DECLARE_MAC_BUF(mac); nes_debug(NES_DBG_NIC_RX, "Assigning MC Address %pM to register 0x%04X nic_idx=%d\n",
nes_debug(NES_DBG_NIC_RX, "Assigning MC Address %s to register 0x%04X nic_idx=%d\n", multicast_addr->dmi_addr,
print_mac(mac, multicast_addr->dmi_addr),
perfect_filter_register_address+(mc_index * 8), perfect_filter_register_address+(mc_index * 8),
mc_nic_index); mc_nic_index);
macaddr_high = ((u16)multicast_addr->dmi_addr[0]) << 8; macaddr_high = ((u16)multicast_addr->dmi_addr[0]) << 8;
drivers/net/3c503.c
+1 -2
View File
@@ -177,7 +177,6 @@ el2_probe1(struct net_device *dev, int ioaddr)
int i, iobase_reg, membase_reg, saved_406, wordlength, retval; int i, iobase_reg, membase_reg, saved_406, wordlength, retval;
static unsigned version_printed; static unsigned version_printed;
unsigned long vendor_id; unsigned long vendor_id;
DECLARE_MAC_BUF(mac);
if (!request_region(ioaddr, EL2_IO_EXTENT, DRV_NAME)) if (!request_region(ioaddr, EL2_IO_EXTENT, DRV_NAME))
return -EBUSY; return -EBUSY;
@@ -228,7 +227,7 @@ el2_probe1(struct net_device *dev, int ioaddr)
/* Retrieve and print the ethernet address. */ /* Retrieve and print the ethernet address. */
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
dev->dev_addr[i] = inb(ioaddr + i); dev->dev_addr[i] = inb(ioaddr + i);
printk("%s", print_mac(mac, dev->dev_addr)); printk("%pM", dev->dev_addr);
/* Map the 8390 back into the window. */ /* Map the 8390 back into the window. */
outb(ECNTRL_THIN, ioaddr + 0x406); outb(ECNTRL_THIN, ioaddr + 0x406);
drivers/net/3c505.c
+2 -3
View File
@@ -1385,7 +1385,6 @@ static int __init elplus_setup(struct net_device *dev)
unsigned long timeout; unsigned long timeout;
unsigned long cookie = 0; unsigned long cookie = 0;
int err = -ENODEV; int err = -ENODEV;
DECLARE_MAC_BUF(mac);
/* /*
* setup adapter structure * setup adapter structure
@@ -1522,9 +1521,9 @@ static int __init elplus_setup(struct net_device *dev)
* print remainder of startup message * print remainder of startup message
*/ */
printk(KERN_INFO "%s: 3c505 at %#lx, irq %d, dma %d, " printk(KERN_INFO "%s: 3c505 at %#lx, irq %d, dma %d, "
"addr %s, ", "addr %pM, ",
dev->name, dev->base_addr, dev->irq, dev->dma, dev->name, dev->base_addr, dev->irq, dev->dma,
print_mac(mac, dev->dev_addr)); dev->dev_addr);
/* /*
* read more information from the adapter * read more information from the adapter
drivers/net/3c507.c
+1 -2
View File
@@ -357,7 +357,6 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr)
static unsigned char init_ID_done, version_printed; static unsigned char init_ID_done, version_printed;
int i, irq, irqval, retval; int i, irq, irqval, retval;
struct net_local *lp; struct net_local *lp;
DECLARE_MAC_BUF(mac);
if (init_ID_done == 0) { if (init_ID_done == 0) {
ushort lrs_state = 0xff; ushort lrs_state = 0xff;
@@ -405,7 +404,7 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr)
outb(0x01, ioaddr + MISC_CTRL); outb(0x01, ioaddr + MISC_CTRL);
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
dev->dev_addr[i] = inb(ioaddr + i); dev->dev_addr[i] = inb(ioaddr + i);
printk(" %s", print_mac(mac, dev->dev_addr)); printk(" %pM", dev->dev_addr);
if (mem_start) if (mem_start)
net_debug = mem_start & 7; net_debug = mem_start & 7;
drivers/net/3c509.c
+2 -3
View File
@@ -541,7 +541,6 @@ static int __init el3_common_init(struct net_device *dev)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
int err; int err;
DECLARE_MAC_BUF(mac);
const char *if_names[] = {"10baseT", "AUI", "undefined", "BNC"}; const char *if_names[] = {"10baseT", "AUI", "undefined", "BNC"};
spin_lock_init(&lp->lock); spin_lock_init(&lp->lock);
@@ -575,9 +574,9 @@ static int __init el3_common_init(struct net_device *dev)
} }
printk(KERN_INFO "%s: 3c5x9 found at %#3.3lx, %s port, " printk(KERN_INFO "%s: 3c5x9 found at %#3.3lx, %s port, "
"address %s, IRQ %d.\n", "address %pM, IRQ %d.\n",
dev->name, dev->base_addr, if_names[(dev->if_port & 0x03)], dev->name, dev->base_addr, if_names[(dev->if_port & 0x03)],
print_mac(mac, dev->dev_addr), dev->irq); dev->dev_addr, dev->irq);
if (el3_debug > 0) if (el3_debug > 0)
printk(KERN_INFO "%s", version); printk(KERN_INFO "%s", version);
drivers/net/3c515.c
+1 -2
View File
@@ -570,7 +570,6 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
unsigned int eeprom[0x40], checksum = 0; /* EEPROM contents */ unsigned int eeprom[0x40], checksum = 0; /* EEPROM contents */
int i; int i;
int irq; int irq;
DECLARE_MAC_BUF(mac);
#ifdef __ISAPNP__ #ifdef __ISAPNP__
if (idev) { if (idev) {
@@ -636,7 +635,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
checksum = (checksum ^ (checksum >> 8)) & 0xff; checksum = (checksum ^ (checksum >> 8)) & 0xff;
if (checksum != 0x00) if (checksum != 0x00)
printk(" ***INVALID CHECKSUM %4.4x*** ", checksum); printk(" ***INVALID CHECKSUM %4.4x*** ", checksum);
printk(" %s", print_mac(mac, dev->dev_addr)); printk(" %pM", dev->dev_addr);
if (eeprom[16] == 0x11c7) { /* Corkscrew */ if (eeprom[16] == 0x11c7) { /* Corkscrew */
if (request_dma(dev->dma, "3c515")) { if (request_dma(dev->dma, "3c515")) {
printk(", DMA %d allocation failed", dev->dma); printk(", DMA %d allocation failed", dev->dma);
drivers/net/3c523.c
+4 -6
View File
@@ -383,7 +383,6 @@ static int elmc_getinfo(char *buf, int slot, void *d)
{ {
int len = 0; int len = 0;
struct net_device *dev = d; struct net_device *dev = d;
DECLARE_MAC_BUF(mac);
if (dev == NULL) if (dev == NULL)
return len; return len;
@@ -398,8 +397,8 @@ static int elmc_getinfo(char *buf, int slot, void *d)
len += sprintf(buf + len, "Transceiver: %s\n", dev->if_port ? len += sprintf(buf + len, "Transceiver: %s\n", dev->if_port ?
"External" : "Internal"); "External" : "Internal");
len += sprintf(buf + len, "Device: %s\n", dev->name); len += sprintf(buf + len, "Device: %s\n", dev->name);
len += sprintf(buf + len, "Hardware Address: %s\n", len += sprintf(buf + len, "Hardware Address: %pM\n",
print_mac(mac, dev->dev_addr)); dev->dev_addr);
return len; return len;
} /* elmc_getinfo() */ } /* elmc_getinfo() */
@@ -417,7 +416,6 @@ static int __init do_elmc_probe(struct net_device *dev)
unsigned int size = 0; unsigned int size = 0;
int retval; int retval;
struct priv *pr = dev->priv; struct priv *pr = dev->priv;
DECLARE_MAC_BUF(mac);
if (MCA_bus == 0) { if (MCA_bus == 0) {
return -ENODEV; return -ENODEV;
@@ -543,8 +541,8 @@ static int __init do_elmc_probe(struct net_device *dev)
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
dev->dev_addr[i] = inb(dev->base_addr + i); dev->dev_addr[i] = inb(dev->base_addr + i);
printk(KERN_INFO "%s: hardware address %s\n", printk(KERN_INFO "%s: hardware address %pM\n",
dev->name, print_mac(mac, dev->dev_addr)); dev->name, dev->dev_addr);
dev->open = &elmc_open; dev->open = &elmc_open;
dev->stop = &elmc_close; dev->stop = &elmc_close;
drivers/net/3c527.c
+1 -2
View File
@@ -335,7 +335,6 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
"82586 initialisation failure", "82586 initialisation failure",
"Adapter list configuration error" "Adapter list configuration error"
}; };
DECLARE_MAC_BUF(mac);
/* Time to play MCA games */ /* Time to play MCA games */
@@ -405,7 +404,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
dev->dev_addr[i] = mca_read_pos(slot,3); dev->dev_addr[i] = mca_read_pos(slot,3);
} }
printk("%s: Address %s", dev->name, print_mac(mac, dev->dev_addr)); printk("%s: Address %pM", dev->name, dev->dev_addr);
mca_write_pos(slot, 6, 0); mca_write_pos(slot, 6, 0);
mca_write_pos(slot, 7, 0); mca_write_pos(slot, 7, 0);
drivers/net/3c59x.c
+1 -2
View File
@@ -1013,7 +1013,6 @@ static int __devinit vortex_probe1(struct device *gendev,
const char *print_name = "3c59x"; const char *print_name = "3c59x";
struct pci_dev *pdev = NULL; struct pci_dev *pdev = NULL;
struct eisa_device *edev = NULL; struct eisa_device *edev = NULL;
DECLARE_MAC_BUF(mac);
if (!printed_version) { if (!printed_version) {
printk (version); printk (version);
@@ -1206,7 +1205,7 @@ static int __devinit vortex_probe1(struct device *gendev,
((__be16 *)dev->dev_addr)[i] = htons(eeprom[i + 10]); ((__be16 *)dev->dev_addr)[i] = htons(eeprom[i + 10]);
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
if (print_info) if (print_info)
printk(" %s", print_mac(mac, dev->dev_addr)); printk(" %pM", dev->dev_addr);
/* Unfortunately an all zero eeprom passes the checksum and this /* Unfortunately an all zero eeprom passes the checksum and this
gets found in the wild in failure cases. Crypto is hard 8) */ gets found in the wild in failure cases. Crypto is hard 8) */
if (!is_valid_ether_addr(dev->dev_addr)) { if (!is_valid_ether_addr(dev->dev_addr)) {
drivers/net/8139cp.c
+2 -3
View File
@@ -1826,7 +1826,6 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
void __iomem *regs; void __iomem *regs;
resource_size_t pciaddr; resource_size_t pciaddr;
unsigned int addr_len, i, pci_using_dac; unsigned int addr_len, i, pci_using_dac;
DECLARE_MAC_BUF(mac);
#ifndef MODULE #ifndef MODULE
static int version_printed; static int version_printed;
@@ -1967,10 +1966,10 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_out_iomap; goto err_out_iomap;
printk (KERN_INFO "%s: RTL-8139C+ at 0x%lx, " printk (KERN_INFO "%s: RTL-8139C+ at 0x%lx, "
"%s, IRQ %d\n", "%pM, IRQ %d\n",
dev->name, dev->name,
dev->base_addr, dev->base_addr,
print_mac(mac, dev->dev_addr), dev->dev_addr,
dev->irq); dev->irq);
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
drivers/net/8139too.c
+2 -3
View File
@@ -925,7 +925,6 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
int i, addr_len, option; int i, addr_len, option;
void __iomem *ioaddr; void __iomem *ioaddr;
static int board_idx = -1; static int board_idx = -1;
DECLARE_MAC_BUF(mac);
assert (pdev != NULL); assert (pdev != NULL);
assert (ent != NULL); assert (ent != NULL);
@@ -1024,11 +1023,11 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
pci_set_drvdata (pdev, dev); pci_set_drvdata (pdev, dev);
printk (KERN_INFO "%s: %s at 0x%lx, " printk (KERN_INFO "%s: %s at 0x%lx, "
"%s, IRQ %d\n", "%pM, IRQ %d\n",
dev->name, dev->name,
board_info[ent->driver_data].name, board_info[ent->driver_data].name,
dev->base_addr, dev->base_addr,
print_mac(mac, dev->dev_addr), dev->dev_addr,
dev->irq); dev->irq);
printk (KERN_DEBUG "%s: Identified 8139 chip type '%s'\n", printk (KERN_DEBUG "%s: Identified 8139 chip type '%s'\n",
drivers/net/82596.c
+4 -9
View File
@@ -1116,12 +1116,8 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
static void print_eth(unsigned char *add, char *str) static void print_eth(unsigned char *add, char *str)
{ {
DECLARE_MAC_BUF(mac); printk(KERN_DEBUG "i596 0x%p, %pM --> %pM %02X%02X, %s\n",
DECLARE_MAC_BUF(mac2); add, add + 6, add, add[12], add[13], str);
printk(KERN_DEBUG "i596 0x%p, %s --> %s %02X%02X, %s\n",
add, print_mac(mac, add + 6), print_mac(mac2, add),
add[12], add[13], str);
} }
static int io = 0x300; static int io = 0x300;
@@ -1544,7 +1540,6 @@ static void set_multicast_list(struct net_device *dev)
struct dev_mc_list *dmi; struct dev_mc_list *dmi;
unsigned char *cp; unsigned char *cp;
struct mc_cmd *cmd; struct mc_cmd *cmd;
DECLARE_MAC_BUF(mac);
if (wait_cfg(dev, &lp->mc_cmd.cmd, 1000, "multicast list change request timed out")) if (wait_cfg(dev, &lp->mc_cmd.cmd, 1000, "multicast list change request timed out"))
return; return;
@@ -1555,8 +1550,8 @@ static void set_multicast_list(struct net_device *dev)
for (dmi = dev->mc_list; cnt && dmi != NULL; dmi = dmi->next, cnt--, cp += 6) { for (dmi = dev->mc_list; cnt && dmi != NULL; dmi = dmi->next, cnt--, cp += 6) {
memcpy(cp, dmi->dmi_addr, 6); memcpy(cp, dmi->dmi_addr, 6);
if (i596_debug > 1) if (i596_debug > 1)
DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %s\n", DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %pM\n",
dev->name, print_mac(mac, cp))); dev->name, cp));
} }
i596_add_cmd(dev, &cmd->cmd); i596_add_cmd(dev, &cmd->cmd);
} }
drivers/net/a2065.c
+1 -3
View File
@@ -710,7 +710,6 @@ static int __devinit a2065_init_one(struct zorro_dev *z,
unsigned long board, base_addr, mem_start; unsigned long board, base_addr, mem_start;
struct resource *r1, *r2; struct resource *r1, *r2;
int err; int err;
DECLARE_MAC_BUF(mac);
board = z->resource.start; board = z->resource.start;
base_addr = board+A2065_LANCE; base_addr = board+A2065_LANCE;
@@ -787,8 +786,7 @@ static int __devinit a2065_init_one(struct zorro_dev *z,
zorro_set_drvdata(z, dev); zorro_set_drvdata(z, dev);
printk(KERN_INFO "%s: A2065 at 0x%08lx, Ethernet Address " printk(KERN_INFO "%s: A2065 at 0x%08lx, Ethernet Address "
"%s\n", dev->name, board, "%pM\n", dev->name, board, dev->dev_addr);
print_mac(mac, dev->dev_addr));
return 0; return 0;
} }
drivers/net/ac3200.c
+2 -3
View File
@@ -146,7 +146,6 @@ out:
static int __init ac_probe1(int ioaddr, struct net_device *dev) static int __init ac_probe1(int ioaddr, struct net_device *dev)
{ {
int i, retval; int i, retval;
DECLARE_MAC_BUF(mac);
if (!request_region(ioaddr, AC_IO_EXTENT, DRV_NAME)) if (!request_region(ioaddr, AC_IO_EXTENT, DRV_NAME))
return -EBUSY; return -EBUSY;
@@ -171,8 +170,8 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev)
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
dev->dev_addr[i] = inb(ioaddr + AC_SA_PROM + i); dev->dev_addr[i] = inb(ioaddr + AC_SA_PROM + i);
printk(KERN_DEBUG "AC3200 in EISA slot %d, node %s", printk(KERN_DEBUG "AC3200 in EISA slot %d, node %pM",
ioaddr/0x1000, print_mac(mac, dev->dev_addr)); ioaddr/0x1000, dev->dev_addr);
#if 0 #if 0
/* Check the vendor ID/prefix. Redundant after checking the EISA ID */ /* Check the vendor ID/prefix. Redundant after checking the EISA ID */
if (inb(ioaddr + AC_SA_PROM + 0) != AC_ADDR0 if (inb(ioaddr + AC_SA_PROM + 0) != AC_ADDR0
drivers/net/acenic.c
+1 -2
View File
@@ -892,7 +892,6 @@ static int __devinit ace_init(struct net_device *dev)
int board_idx, ecode = 0; int board_idx, ecode = 0;
short i; short i;
unsigned char cache_size; unsigned char cache_size;
DECLARE_MAC_BUF(mac);
ap = netdev_priv(dev); ap = netdev_priv(dev);
regs = ap->regs; regs = ap->regs;
@@ -1019,7 +1018,7 @@ static int __devinit ace_init(struct net_device *dev)
dev->dev_addr[4] = (mac2 >> 8) & 0xff; dev->dev_addr[4] = (mac2 >> 8) & 0xff;
dev->dev_addr[5] = mac2 & 0xff; dev->dev_addr[5] = mac2 & 0xff;
printk("MAC: %s\n", print_mac(mac, dev->dev_addr)); printk("MAC: %pM\n", dev->dev_addr);
/* /*
* Looks like this is necessary to deal with on all architectures, * Looks like this is necessary to deal with on all architectures,
drivers/net/amd8111e.c
+2 -3
View File
@@ -1820,7 +1820,6 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
unsigned long reg_addr,reg_len; unsigned long reg_addr,reg_len;
struct amd8111e_priv* lp; struct amd8111e_priv* lp;
struct net_device* dev; struct net_device* dev;
DECLARE_MAC_BUF(mac);
err = pci_enable_device(pdev); err = pci_enable_device(pdev);
if(err){ if(err){
@@ -1962,8 +1961,8 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
chip_version = (readl(lp->mmio + CHIPID) & 0xf0000000)>>28; chip_version = (readl(lp->mmio + CHIPID) & 0xf0000000)>>28;
printk(KERN_INFO "%s: AMD-8111e Driver Version: %s\n", printk(KERN_INFO "%s: AMD-8111e Driver Version: %s\n",
dev->name,MODULE_VERS); dev->name,MODULE_VERS);
printk(KERN_INFO "%s: [ Rev %x ] PCI 10/100BaseT Ethernet %s\n", printk(KERN_INFO "%s: [ Rev %x ] PCI 10/100BaseT Ethernet %pM\n",
dev->name, chip_version, print_mac(mac, dev->dev_addr)); dev->name, chip_version, dev->dev_addr);
if (lp->ext_phy_id) if (lp->ext_phy_id)
printk(KERN_INFO "%s: Found MII PHY ID 0x%08x at address 0x%02x\n", printk(KERN_INFO "%s: Found MII PHY ID 0x%08x at address 0x%02x\n",
dev->name, lp->ext_phy_id, lp->ext_phy_addr); dev->name, lp->ext_phy_id, lp->ext_phy_addr);
drivers/net/apne.c
+1 -2
View File
@@ -207,7 +207,6 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
int neX000, ctron; int neX000, ctron;
#endif #endif
static unsigned version_printed; static unsigned version_printed;
DECLARE_MAC_BUF(mac);
if (ei_debug && version_printed++ == 0) if (ei_debug && version_printed++ == 0)
printk(version); printk(version);
@@ -323,7 +322,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
for(i = 0; i < ETHER_ADDR_LEN; i++) for(i = 0; i < ETHER_ADDR_LEN; i++)
dev->dev_addr[i] = SA_prom[i]; dev->dev_addr[i] = SA_prom[i];
printk(" %s\n", print_mac(mac, dev->dev_addr)); printk(" %pM\n", dev->dev_addr);
printk("%s: %s found.\n", dev->name, name); printk("%s: %s found.\n", dev->name, name);
drivers/net/ariadne.c
+6 -14
View File
@@ -165,7 +165,6 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
struct net_device *dev; struct net_device *dev;
struct ariadne_private *priv; struct ariadne_private *priv;
int err; int err;
DECLARE_MAC_BUF(mac);
r1 = request_mem_region(base_addr, sizeof(struct Am79C960), "Am79C960"); r1 = request_mem_region(base_addr, sizeof(struct Am79C960), "Am79C960");
if (!r1) if (!r1)
@@ -215,9 +214,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
} }
zorro_set_drvdata(z, dev); zorro_set_drvdata(z, dev);
printk(KERN_INFO "%s: Ariadne at 0x%08lx, Ethernet Address " printk(KERN_INFO "%s: Ariadne at 0x%08lx, Ethernet Address %pM\n",
"%s\n", dev->name, board, dev->name, board, dev->dev_addr);
print_mac(mac, dev->dev_addr));
return 0; return 0;
} }
@@ -613,14 +611,10 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev)
#if 0 #if 0
{ {
DECLARE_MAC_BUF(mac); printk(KERN_DEBUG "TX pkt type 0x%04x from %pM to %pM "
DECLARE_MAC_BUF(mac2);
printk(KERN_DEBUG "TX pkt type 0x%04x from %s to %s "
" data 0x%08x len %d\n", " data 0x%08x len %d\n",
((u_short *)skb->data)[6], ((u_short *)skb->data)[6],
print_mac(mac, ((const u8 *)skb->data)+6), skb->data + 6, skb->data,
print_mac(mac, (const u8 *)skb->data),
(int)skb->data, (int)skb->len); (int)skb->data, (int)skb->len);
} }
#endif #endif
@@ -743,18 +737,16 @@ static int ariadne_rx(struct net_device *dev)
skb->protocol=eth_type_trans(skb,dev); skb->protocol=eth_type_trans(skb,dev);
#if 0 #if 0
{ {
DECLARE_MAC_BUF(mac);
printk(KERN_DEBUG "RX pkt type 0x%04x from ", printk(KERN_DEBUG "RX pkt type 0x%04x from ",
((u_short *)skb->data)[6]); ((u_short *)skb->data)[6]);
{ {
u_char *ptr = &((u_char *)skb->data)[6]; u_char *ptr = &((u_char *)skb->data)[6];
printk("%s", print_mac(mac, ptr)); printk("%pM", ptr);
} }
printk(" to "); printk(" to ");
{ {
u_char *ptr = (u_char *)skb->data; u_char *ptr = (u_char *)skb->data;
printk("%s", print_mac(mac, ptr)); printk("%pM", ptr);
} }
printk(" data 0x%08x len %d\n", (int)skb->data, (int)skb->len); printk(" data 0x%08x len %d\n", (int)skb->data, (int)skb->len);
} }
drivers/net/arm/am79c961a.c
+2 -4
View File
@@ -745,10 +745,8 @@ static int __init am79c961_probe(struct platform_device *pdev)
ret = register_netdev(dev); ret = register_netdev(dev);
if (ret == 0) { if (ret == 0) {
DECLARE_MAC_BUF(mac); printk(KERN_INFO "%s: ether address %pM\n",
dev->name, dev->dev_addr);
printk(KERN_INFO "%s: ether address %s\n",
dev->name, print_mac(mac, dev->dev_addr));
return 0; return 0;
} }
drivers/net/arm/at91_ether.c
+4 -6
View File
@@ -485,7 +485,6 @@ static void update_mac_address(struct net_device *dev)
static int set_mac_address(struct net_device *dev, void* addr) static int set_mac_address(struct net_device *dev, void* addr)
{ {
struct sockaddr *address = addr; struct sockaddr *address = addr;
DECLARE_MAC_BUF(mac);
if (!is_valid_ether_addr(address->sa_data)) if (!is_valid_ether_addr(address->sa_data))
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
@@ -493,8 +492,8 @@ static int set_mac_address(struct net_device *dev, void* addr)
memcpy(dev->dev_addr, address->sa_data, dev->addr_len); memcpy(dev->dev_addr, address->sa_data, dev->addr_len);
update_mac_address(dev); update_mac_address(dev);
printk("%s: Setting MAC address to %s\n", dev->name, printk("%s: Setting MAC address to %pM\n", dev->name,
print_mac(mac, dev->dev_addr)); dev->dev_addr);
return 0; return 0;
} }
@@ -978,7 +977,6 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
struct at91_private *lp; struct at91_private *lp;
unsigned int val; unsigned int val;
int res; int res;
DECLARE_MAC_BUF(mac);
dev = alloc_etherdev(sizeof(struct at91_private)); dev = alloc_etherdev(sizeof(struct at91_private));
if (!dev) if (!dev)
@@ -1083,11 +1081,11 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
} }
/* Display ethernet banner */ /* Display ethernet banner */
printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%s)\n", printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%pM)\n",
dev->name, (uint) dev->base_addr, dev->irq, dev->name, (uint) dev->base_addr, dev->irq,
at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_SPD ? "100-" : "10-", at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_SPD ? "100-" : "10-",
at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_FD ? "FullDuplex" : "HalfDuplex", at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_FD ? "FullDuplex" : "HalfDuplex",
print_mac(mac, dev->dev_addr)); dev->dev_addr);
if ((phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID)) if ((phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID))
printk(KERN_INFO "%s: Davicom 9161 PHY %s\n", dev->name, (lp->phy_media == PORT_FIBRE) ? "(Fiber)" : "(Copper)"); printk(KERN_INFO "%s: Davicom 9161 PHY %s\n", dev->name, (lp->phy_media == PORT_FIBRE) ? "(Fiber)" : "(Copper)");
else if (phy_type == MII_LXT971A_ID) else if (phy_type == MII_LXT971A_ID)
drivers/net/arm/ether1.c
+2 -3
View File
@@ -996,7 +996,6 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
{ {
struct net_device *dev; struct net_device *dev;
int i, ret = 0; int i, ret = 0;
DECLARE_MAC_BUF(mac);
ether1_banner(); ether1_banner();
@@ -1044,8 +1043,8 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
if (ret) if (ret)
goto free; goto free;
printk(KERN_INFO "%s: ether1 in slot %d, %s\n", printk(KERN_INFO "%s: ether1 in slot %d, %pM\n",
dev->name, ec->slot_no, print_mac(mac, dev->dev_addr)); dev->name, ec->slot_no, dev->dev_addr);
ecard_set_drvdata(ec, dev); ecard_set_drvdata(ec, dev);
return 0; return 0;
drivers/net/arm/ether3.c
+2 -3
View File
@@ -776,7 +776,6 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
const struct ether3_data *data = id->data; const struct ether3_data *data = id->data;
struct net_device *dev; struct net_device *dev;
int bus_type, ret; int bus_type, ret;
DECLARE_MAC_BUF(mac);
ether3_banner(); ether3_banner();
@@ -859,8 +858,8 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
if (ret) if (ret)
goto free; goto free;
printk("%s: %s in slot %d, %s\n", printk("%s: %s in slot %d, %pM\n",
dev->name, data->name, ec->slot_no, print_mac(mac, dev->dev_addr)); dev->name, data->name, ec->slot_no, dev->dev_addr);
ecard_set_drvdata(ec, dev); ecard_set_drvdata(ec, dev);
return 0; return 0;
drivers/net/arm/etherh.c
+2 -3
View File
@@ -648,7 +648,6 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
struct net_device *dev; struct net_device *dev;
struct etherh_priv *eh; struct etherh_priv *eh;
int ret; int ret;
DECLARE_MAC_BUF(mac);
etherh_banner(); etherh_banner();
@@ -746,8 +745,8 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
if (ret) if (ret)
goto free; goto free;
printk(KERN_INFO "%s: %s in slot %d, %s\n", printk(KERN_INFO "%s: %s in slot %d, %pM\n",
dev->name, data->name, ec->slot_no, print_mac(mac, dev->dev_addr)); dev->name, data->name, ec->slot_no, dev->dev_addr);
ecard_set_drvdata(ec, dev); ecard_set_drvdata(ec, dev);
drivers/net/at1700.c
+1 -2
View File
@@ -265,7 +265,6 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0; unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0;
int slot, ret = -ENODEV; int slot, ret = -ENODEV;
struct net_local *lp = netdev_priv(dev); struct net_local *lp = netdev_priv(dev);
DECLARE_MAC_BUF(mac);
if (!request_region(ioaddr, AT1700_IO_EXTENT, DRV_NAME)) if (!request_region(ioaddr, AT1700_IO_EXTENT, DRV_NAME))
return -EBUSY; return -EBUSY;
@@ -397,7 +396,7 @@ found:
dev->dev_addr[i] = val; dev->dev_addr[i] = val;
} }
} }
printk("%s", print_mac(mac, dev->dev_addr)); printk("%pM", dev->dev_addr);
/* The EEPROM word 12 bit 0x0400 means use regular 100 ohm 10baseT signals, /* The EEPROM word 12 bit 0x0400 means use regular 100 ohm 10baseT signals,
rather than 150 ohm shielded twisted pair compensation. rather than 150 ohm shielded twisted pair compensation.
drivers/net/atarilance.c
+5 -12
View File
@@ -466,7 +466,6 @@ static unsigned long __init lance_probe1( struct net_device *dev,
int i; int i;
static int did_version; static int did_version;
unsigned short save1, save2; unsigned short save1, save2;
DECLARE_MAC_BUF(mac);
PROBE_PRINT(( "Probing for Lance card at mem %#lx io %#lx\n", PROBE_PRINT(( "Probing for Lance card at mem %#lx io %#lx\n",
(long)memaddr, (long)ioaddr )); (long)memaddr, (long)ioaddr ));
@@ -595,7 +594,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,
i = IO->mem; i = IO->mem;
break; break;
} }
printk("%s\n", print_mac(mac, dev->dev_addr)); printk("%pM\n", dev->dev_addr);
if (lp->cardtype == OLD_RIEBL) { if (lp->cardtype == OLD_RIEBL) {
printk( "%s: Warning: This is a default ethernet address!\n", printk( "%s: Warning: This is a default ethernet address!\n",
dev->name ); dev->name );
@@ -778,8 +777,6 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
int entry, len; int entry, len;
struct lance_tx_head *head; struct lance_tx_head *head;
unsigned long flags; unsigned long flags;
DECLARE_MAC_BUF(mac);
DECLARE_MAC_BUF(mac2);
DPRINTK( 2, ( "%s: lance_start_xmit() called, csr0 %4.4x.\n", DPRINTK( 2, ( "%s: lance_start_xmit() called, csr0 %4.4x.\n",
dev->name, DREG )); dev->name, DREG ));
@@ -802,12 +799,10 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
/* Fill in a Tx ring entry */ /* Fill in a Tx ring entry */
if (lance_debug >= 3) { if (lance_debug >= 3) {
printk( "%s: TX pkt type 0x%04x from " printk( "%s: TX pkt type 0x%04x from %pM to %pM"
"%s to %s"
" data at 0x%08x len %d\n", " data at 0x%08x len %d\n",
dev->name, ((u_short *)skb->data)[6], dev->name, ((u_short *)skb->data)[6],
print_mac(mac, &skb->data[6]), &skb->data[6], skb->data,
print_mac(mac2, skb->data),
(int)skb->data, (int)skb->len ); (int)skb->data, (int)skb->len );
} }
@@ -1019,14 +1014,12 @@ static int lance_rx( struct net_device *dev )
if (lance_debug >= 3) { if (lance_debug >= 3) {
u_char *data = PKTBUF_ADDR(head); u_char *data = PKTBUF_ADDR(head);
DECLARE_MAC_BUF(mac);
DECLARE_MAC_BUF(mac2);
printk(KERN_DEBUG "%s: RX pkt type 0x%04x from %s to %s " printk(KERN_DEBUG "%s: RX pkt type 0x%04x from %pM to %pM "
"data %02x %02x %02x %02x %02x %02x %02x %02x " "data %02x %02x %02x %02x %02x %02x %02x %02x "
"len %d\n", "len %d\n",
dev->name, ((u_short *)data)[6], dev->name, ((u_short *)data)[6],
print_mac(mac, &data[6]), print_mac(mac2, data), &data[6], data,
data[15], data[16], data[17], data[18], data[15], data[16], data[17], data[18],
data[19], data[20], data[21], data[22], data[19], data[20], data[21], data[22],
pkt_len); pkt_len);
drivers/net/atp.c
+2 -3
View File
@@ -248,7 +248,6 @@ static int __init atp_probe1(long ioaddr)
struct net_local *lp; struct net_local *lp;
int saved_ctrl_reg, status, i; int saved_ctrl_reg, status, i;
int res; int res;
DECLARE_MAC_BUF(mac);
outb(0xff, ioaddr + PAR_DATA); outb(0xff, ioaddr + PAR_DATA);
/* Save the original value of the Control register, in case we guessed /* Save the original value of the Control register, in case we guessed
@@ -324,8 +323,8 @@ static int __init atp_probe1(long ioaddr)
#endif #endif
printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, " printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, "
"SAPROM %s.\n", "SAPROM %pM.\n",
dev->name, dev->base_addr, dev->irq, print_mac(mac, dev->dev_addr)); dev->name, dev->base_addr, dev->irq, dev->dev_addr);
/* Reset the ethernet hardware and activate the printer pass-through. */ /* Reset the ethernet hardware and activate the printer pass-through. */
write_reg_high(ioaddr, CMR1, CMR1h_RESET | CMR1h_MUX); write_reg_high(ioaddr, CMR1, CMR1h_RESET | CMR1h_MUX);
drivers/net/ax88796.c
+3 -6
View File
@@ -758,13 +758,10 @@ static int ax_init_dev(struct net_device *dev, int first_init)
#endif #endif
ax_NS8390_init(dev, 0); ax_NS8390_init(dev, 0);
if (first_init) { if (first_init)
DECLARE_MAC_BUF(mac); dev_info(&ax->dev->dev, "%dbit, irq %d, %lx, MAC: %pM\n",
dev_info(&ax->dev->dev, "%dbit, irq %d, %lx, MAC: %s\n",
ei_status.word16 ? 16:8, dev->irq, dev->base_addr, ei_status.word16 ? 16:8, dev->irq, dev->base_addr,
print_mac(mac, dev->dev_addr)); dev->dev_addr);
}
ret = register_netdev(dev); ret = register_netdev(dev);
if (ret) if (ret)
drivers/net/b44.c
+2 -3
View File
@@ -2117,7 +2117,6 @@ static int __devinit b44_init_one(struct ssb_device *sdev,
struct net_device *dev; struct net_device *dev;
struct b44 *bp; struct b44 *bp;
int err; int err;
DECLARE_MAC_BUF(mac);
instance++; instance++;
@@ -2213,8 +2212,8 @@ static int __devinit b44_init_one(struct ssb_device *sdev,
*/ */
b44_chip_reset(bp, B44_CHIP_RESET_FULL); b44_chip_reset(bp, B44_CHIP_RESET_FULL);
printk(KERN_INFO "%s: Broadcom 44xx/47xx 10/100BaseT Ethernet %s\n", printk(KERN_INFO "%s: Broadcom 44xx/47xx 10/100BaseT Ethernet %pM\n",
dev->name, print_mac(mac, dev->dev_addr)); dev->name, dev->dev_addr);
return 0; return 0;
drivers/net/bmac.c
+2 -3
View File
@@ -1258,7 +1258,6 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
unsigned char addr[6]; unsigned char addr[6];
struct net_device *dev; struct net_device *dev;
int is_bmac_plus = ((int)match->data) != 0; int is_bmac_plus = ((int)match->data) != 0;
DECLARE_MAC_BUF(mac);
if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) { if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) {
printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n"); printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n");
@@ -1368,8 +1367,8 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
goto err_out_irq2; goto err_out_irq2;
} }
printk(KERN_INFO "%s: BMAC%s at %s", printk(KERN_INFO "%s: BMAC%s at %pM",
dev->name, (is_bmac_plus ? "+" : ""), print_mac(mac, dev->dev_addr)); dev->name, (is_bmac_plus ? "+" : ""), dev->dev_addr);
XXDEBUG((", base_addr=%#0lx", dev->base_addr)); XXDEBUG((", base_addr=%#0lx", dev->base_addr));
printk("\n"); printk("\n");
drivers/net/bnx2.c
+2 -3
View File
@@ -7700,7 +7700,6 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
struct bnx2 *bp; struct bnx2 *bp;
int rc; int rc;
char str[40]; char str[40];
DECLARE_MAC_BUF(mac);
if (version_printed++ == 0) if (version_printed++ == 0)
printk(KERN_INFO "%s", version); printk(KERN_INFO "%s", version);
@@ -7767,14 +7766,14 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
} }
printk(KERN_INFO "%s: %s (%c%d) %s found at mem %lx, " printk(KERN_INFO "%s: %s (%c%d) %s found at mem %lx, "
"IRQ %d, node addr %s\n", "IRQ %d, node addr %pM\n",
dev->name, dev->name,
board_info[ent->driver_data].name, board_info[ent->driver_data].name,
((CHIP_ID(bp) & 0xf000) >> 12) + 'A', ((CHIP_ID(bp) & 0xf000) >> 12) + 'A',
((CHIP_ID(bp) & 0x0ff0) >> 4), ((CHIP_ID(bp) & 0x0ff0) >> 4),
bnx2_bus_string(bp, str), bnx2_bus_string(bp, str),
dev->base_addr, dev->base_addr,
bp->pdev->irq, print_mac(mac, dev->dev_addr)); bp->pdev->irq, dev->dev_addr);
return 0; return 0;
} }
drivers/net/bnx2x_main.c
+1 -2
View File
@@ -10192,7 +10192,6 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
struct net_device *dev = NULL; struct net_device *dev = NULL;
struct bnx2x *bp; struct bnx2x *bp;
int rc; int rc;
DECLARE_MAC_BUF(mac);
if (version_printed++ == 0) if (version_printed++ == 0)
printk(KERN_INFO "%s", version); printk(KERN_INFO "%s", version);
@@ -10236,7 +10235,7 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
bnx2x_get_pcie_width(bp), bnx2x_get_pcie_width(bp),
(bnx2x_get_pcie_speed(bp) == 2) ? "5GHz (Gen2)" : "2.5GHz", (bnx2x_get_pcie_speed(bp) == 2) ? "5GHz (Gen2)" : "2.5GHz",
dev->base_addr, bp->pdev->irq); dev->base_addr, bp->pdev->irq);
printk(KERN_CONT "node addr %s\n", print_mac(mac, dev->dev_addr)); printk(KERN_CONT "node addr %pM\n", dev->dev_addr);
return 0; return 0;
init_one_exit: init_one_exit:
drivers/net/bonding/bond_main.c
+5 -10
View File
@@ -1791,7 +1791,6 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
struct slave *slave, *oldcurrent; struct slave *slave, *oldcurrent;
struct sockaddr addr; struct sockaddr addr;
int mac_addr_differ; int mac_addr_differ;
DECLARE_MAC_BUF(mac);
/* slave is not a slave or master is not master of this slave */ /* slave is not a slave or master is not master of this slave */
if (!(slave_dev->flags & IFF_SLAVE) || if (!(slave_dev->flags & IFF_SLAVE) ||
@@ -1820,11 +1819,11 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
if (!mac_addr_differ && (bond->slave_cnt > 1)) if (!mac_addr_differ && (bond->slave_cnt > 1))
printk(KERN_WARNING DRV_NAME printk(KERN_WARNING DRV_NAME
": %s: Warning: the permanent HWaddr of %s - " ": %s: Warning: the permanent HWaddr of %s - "
"%s - is still in use by %s. " "%pM - is still in use by %s. "
"Set the HWaddr of %s to a different address " "Set the HWaddr of %s to a different address "
"to avoid conflicts.\n", "to avoid conflicts.\n",
bond_dev->name, slave_dev->name, bond_dev->name, slave_dev->name,
print_mac(mac, slave->perm_hwaddr), slave->perm_hwaddr,
bond_dev->name, slave_dev->name); bond_dev->name, slave_dev->name);
} }
@@ -3285,7 +3284,6 @@ static void bond_info_show_master(struct seq_file *seq)
if (bond->params.mode == BOND_MODE_8023AD) { if (bond->params.mode == BOND_MODE_8023AD) {
struct ad_info ad_info; struct ad_info ad_info;
DECLARE_MAC_BUF(mac);
seq_puts(seq, "\n802.3ad info\n"); seq_puts(seq, "\n802.3ad info\n");
seq_printf(seq, "LACP rate: %s\n", seq_printf(seq, "LACP rate: %s\n",
@@ -3305,8 +3303,8 @@ static void bond_info_show_master(struct seq_file *seq)
ad_info.actor_key); ad_info.actor_key);
seq_printf(seq, "\tPartner Key: %d\n", seq_printf(seq, "\tPartner Key: %d\n",
ad_info.partner_key); ad_info.partner_key);
seq_printf(seq, "\tPartner Mac Address: %s\n", seq_printf(seq, "\tPartner Mac Address: %pM\n",
print_mac(mac, ad_info.partner_system)); ad_info.partner_system);
} }
} }
} }
@@ -3314,7 +3312,6 @@ static void bond_info_show_master(struct seq_file *seq)
static void bond_info_show_slave(struct seq_file *seq, const struct slave *slave) static void bond_info_show_slave(struct seq_file *seq, const struct slave *slave)
{ {
struct bonding *bond = seq->private; struct bonding *bond = seq->private;
DECLARE_MAC_BUF(mac);
seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name); seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
seq_printf(seq, "MII Status: %s\n", seq_printf(seq, "MII Status: %s\n",
@@ -3322,9 +3319,7 @@ static void bond_info_show_slave(struct seq_file *seq, const struct slave *slave
seq_printf(seq, "Link Failure Count: %u\n", seq_printf(seq, "Link Failure Count: %u\n",
slave->link_failure_count); slave->link_failure_count);
seq_printf(seq, seq_printf(seq, "Permanent HW addr: %pM\n", slave->perm_hwaddr);
"Permanent HW addr: %s\n",
print_mac(mac, slave->perm_hwaddr));
if (bond->params.mode == BOND_MODE_8023AD) { if (bond->params.mode == BOND_MODE_8023AD) {
const struct aggregator *agg const struct aggregator *agg
drivers/net/bonding/bond_sysfs.c
+1 -3
View File
@@ -1391,13 +1391,11 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d,
{ {
int count = 0; int count = 0;
struct bonding *bond = to_bond(d); struct bonding *bond = to_bond(d);
DECLARE_MAC_BUF(mac);
if (bond->params.mode == BOND_MODE_8023AD) { if (bond->params.mode == BOND_MODE_8023AD) {
struct ad_info ad_info; struct ad_info ad_info;
if (!bond_3ad_get_active_agg_info(bond, &ad_info)) { if (!bond_3ad_get_active_agg_info(bond, &ad_info)) {
count = sprintf(buf,"%s\n", count = sprintf(buf, "%pM\n", ad_info.partner_system);
print_mac(mac, ad_info.partner_system));
} }
} }
drivers/net/cassini.c
+2 -3
View File
@@ -4988,7 +4988,6 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
int i, err, pci_using_dac; int i, err, pci_using_dac;
u16 pci_cmd; u16 pci_cmd;
u8 orig_cacheline_size = 0, cas_cacheline_size = 0; u8 orig_cacheline_size = 0, cas_cacheline_size = 0;
DECLARE_MAC_BUF(mac);
if (cas_version_printed++ == 0) if (cas_version_printed++ == 0)
printk(KERN_INFO "%s", version); printk(KERN_INFO "%s", version);
@@ -5201,12 +5200,12 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
i = readl(cp->regs + REG_BIM_CFG); i = readl(cp->regs + REG_BIM_CFG);
printk(KERN_INFO "%s: Sun Cassini%s (%sbit/%sMHz PCI/%s) " printk(KERN_INFO "%s: Sun Cassini%s (%sbit/%sMHz PCI/%s) "
"Ethernet[%d] %s\n", dev->name, "Ethernet[%d] %pM\n", dev->name,
(cp->cas_flags & CAS_FLAG_REG_PLUS) ? "+" : "", (cp->cas_flags & CAS_FLAG_REG_PLUS) ? "+" : "",
(i & BIM_CFG_32BIT) ? "32" : "64", (i & BIM_CFG_32BIT) ? "32" : "64",
(i & BIM_CFG_66MHZ) ? "66" : "33", (i & BIM_CFG_66MHZ) ? "66" : "33",
(cp->phy_type == CAS_PHY_SERDES) ? "Fi" : "Cu", pdev->irq, (cp->phy_type == CAS_PHY_SERDES) ? "Fi" : "Cu", pdev->irq,
print_mac(mac, dev->dev_addr)); dev->dev_addr);
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
cp->hw_running = 1; cp->hw_running = 1;
drivers/net/cpmac.c
+2 -3
View File
@@ -1103,7 +1103,6 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
struct cpmac_priv *priv; struct cpmac_priv *priv;
struct net_device *dev; struct net_device *dev;
struct plat_cpmac_data *pdata; struct plat_cpmac_data *pdata;
DECLARE_MAC_BUF(mac);
pdata = pdev->dev.platform_data; pdata = pdev->dev.platform_data;
@@ -1180,8 +1179,8 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
if (netif_msg_probe(priv)) { if (netif_msg_probe(priv)) {
printk(KERN_INFO printk(KERN_INFO
"cpmac: device %s (regs: %p, irq: %d, phy: %s, " "cpmac: device %s (regs: %p, irq: %d, phy: %s, "
"mac: %s)\n", dev->name, (void *)mem->start, dev->irq, "mac: %pM)\n", dev->name, (void *)mem->start, dev->irq,
priv->phy_name, print_mac(mac, dev->dev_addr)); priv->phy_name, dev->dev_addr);
} }
return 0; return 0;
drivers/net/cris/eth_v10.c
+1 -3
View File
@@ -419,7 +419,6 @@ e100_set_mac_address(struct net_device *dev, void *p)
{ {
struct net_local *np = netdev_priv(dev); struct net_local *np = netdev_priv(dev);
struct sockaddr *addr = p; struct sockaddr *addr = p;
DECLARE_MAC_BUF(mac);
spin_lock(&np->lock); /* preemption protection */ spin_lock(&np->lock); /* preemption protection */
@@ -440,8 +439,7 @@ e100_set_mac_address(struct net_device *dev, void *p)
/* show it in the log as well */ /* show it in the log as well */
printk(KERN_INFO "%s: changed MAC to %s\n", printk(KERN_INFO "%s: changed MAC to %pM\n", dev->name, dev->dev_addr);
dev->name, print_mac(mac, dev->dev_addr));
spin_unlock(&np->lock); spin_unlock(&np->lock);
drivers/net/cs89x0.c
+5 -7
View File
@@ -521,7 +521,6 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
unsigned rev_type = 0; unsigned rev_type = 0;
int eeprom_buff[CHKSUM_LEN]; int eeprom_buff[CHKSUM_LEN];
int retval; int retval;
DECLARE_MAC_BUF(mac);
/* Initialize the device structure. */ /* Initialize the device structure. */
if (!modular) { if (!modular) {
@@ -846,7 +845,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
} }
/* print the ethernet address. */ /* print the ethernet address. */
printk(", MAC %s", print_mac(mac, dev->dev_addr)); printk(", MAC %pM", dev->dev_addr);
dev->open = net_open; dev->open = net_open;
dev->stop = net_close; dev->stop = net_close;
@@ -1817,11 +1816,10 @@ static int set_mac_address(struct net_device *dev, void *p)
memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
if (net_debug) { if (net_debug)
DECLARE_MAC_BUF(mac); printk("%s: Setting MAC address to %pM.\n",
printk("%s: Setting MAC address to %s.\n", dev->name, dev->dev_addr);
dev->name, print_mac(mac, dev->dev_addr));
}
/* set the Ethernet address */ /* set the Ethernet address */
for (i=0; i < ETH_ALEN/2; i++) for (i=0; i < ETH_ALEN/2; i++)
writereg(dev, PP_IA+i*2, dev->dev_addr[i*2] | (dev->dev_addr[i*2+1] << 8)); writereg(dev, PP_IA+i*2, dev->dev_addr[i*2] | (dev->dev_addr[i*2+1] << 8));
drivers/net/de600.c
+1 -2
View File
@@ -384,7 +384,6 @@ static struct net_device * __init de600_probe(void)
int i; int i;
struct net_device *dev; struct net_device *dev;
int err; int err;
DECLARE_MAC_BUF(mac);
dev = alloc_etherdev(0); dev = alloc_etherdev(0);
if (!dev) if (!dev)
@@ -439,7 +438,7 @@ static struct net_device * __init de600_probe(void)
goto out1; goto out1;
} }
printk(", Ethernet Address: %s\n", print_mac(mac, dev->dev_addr)); printk(", Ethernet Address: %pM\n", dev->dev_addr);
dev->open = de600_open; dev->open = de600_open;
dev->stop = de600_close; dev->stop = de600_close;
drivers/net/de620.c
+1 -2
View File
@@ -800,7 +800,6 @@ struct net_device * __init de620_probe(int unit)
struct net_device *dev; struct net_device *dev;
int err = -ENOMEM; int err = -ENOMEM;
int i; int i;
DECLARE_MAC_BUF(mac);
dev = alloc_etherdev(0); dev = alloc_etherdev(0);
if (!dev) if (!dev)
@@ -853,7 +852,7 @@ struct net_device * __init de620_probe(int unit)
dev->broadcast[i] = 0xff; dev->broadcast[i] = 0xff;
} }
printk(", Ethernet Address: %s", print_mac(mac, dev->dev_addr)); printk(", Ethernet Address: %pM", dev->dev_addr);
printk(" (%dk RAM,", printk(" (%dk RAM,",
(nic_data.RAM_Size) ? (nic_data.RAM_Size >> 2) : 64); (nic_data.RAM_Size) ? (nic_data.RAM_Size >> 2) : 64);
drivers/net/declance.c
+1 -3
View File
@@ -1023,7 +1023,6 @@ static int __init dec_lance_probe(struct device *bdev, const int type)
int i, ret; int i, ret;
unsigned long esar_base; unsigned long esar_base;
unsigned char *esar; unsigned char *esar;
DECLARE_MAC_BUF(mac);
if (dec_lance_debug && version_printed++ == 0) if (dec_lance_debug && version_printed++ == 0)
printk(version); printk(version);
@@ -1223,8 +1222,7 @@ static int __init dec_lance_probe(struct device *bdev, const int type)
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
dev->dev_addr[i] = esar[i * 4]; dev->dev_addr[i] = esar[i * 4];
printk(", addr = %s, irq = %d\n", printk(", addr = %pM, irq = %d\n", dev->dev_addr, dev->irq);
print_mac(mac, dev->dev_addr), dev->irq);
dev->open = &lance_open; dev->open = &lance_open;
dev->stop = &lance_close; dev->stop = &lance_close;
drivers/net/depca.c
+2 -4
View File
@@ -573,7 +573,6 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device)
s16 nicsr; s16 nicsr;
u_long ioaddr; u_long ioaddr;
u_long mem_start; u_long mem_start;
DECLARE_MAC_BUF(mac);
/* /*
* We are now supposed to enter this function with the * We are now supposed to enter this function with the
@@ -633,7 +632,7 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device)
printk(", h/w address "); printk(", h/w address ");
status = get_hw_addr(dev); status = get_hw_addr(dev);
printk("%s", print_mac(mac, dev->dev_addr)); printk("%pM", dev->dev_addr);
if (status != 0) { if (status != 0) {
printk(" which has an Ethernet PROM CRC error.\n"); printk(" which has an Ethernet PROM CRC error.\n");
return -ENXIO; return -ENXIO;
@@ -1841,7 +1840,6 @@ static void depca_dbg_open(struct net_device *dev)
u_long ioaddr = dev->base_addr; u_long ioaddr = dev->base_addr;
struct depca_init *p = &lp->init_block; struct depca_init *p = &lp->init_block;
int i; int i;
DECLARE_MAC_BUF(mac);
if (depca_debug > 1) { if (depca_debug > 1) {
/* Do not copy the shadow init block into shared memory */ /* Do not copy the shadow init block into shared memory */
@@ -1880,7 +1878,7 @@ static void depca_dbg_open(struct net_device *dev)
printk("...0x%8.8x\n", readl(&lp->tx_ring[i].base)); printk("...0x%8.8x\n", readl(&lp->tx_ring[i].base));
printk("Initialisation block at 0x%8.8lx(Phys)\n", lp->mem_start); printk("Initialisation block at 0x%8.8lx(Phys)\n", lp->mem_start);
printk(" mode: 0x%4.4x\n", p->mode); printk(" mode: 0x%4.4x\n", p->mode);
printk(" physical address: %s\n", print_mac(mac, p->phys_addr)); printk(" physical address: %pM\n", p->phys_addr);
printk(" multicast hash table: "); printk(" multicast hash table: ");
for (i = 0; i < (HASH_TABLE_LEN >> 3) - 1; i++) { for (i = 0; i < (HASH_TABLE_LEN >> 3) - 1; i++) {
printk("%2.2x:", p->mcast_table[i]); printk("%2.2x:", p->mcast_table[i]);
drivers/net/dl2k.c
+2 -3
View File
@@ -97,7 +97,6 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
static int version_printed; static int version_printed;
void *ring_space; void *ring_space;
dma_addr_t ring_dma; dma_addr_t ring_dma;
DECLARE_MAC_BUF(mac);
if (!version_printed++) if (!version_printed++)
printk ("%s", version); printk ("%s", version);
@@ -257,8 +256,8 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
card_idx++; card_idx++;
printk (KERN_INFO "%s: %s, %s, IRQ %d\n", printk (KERN_INFO "%s: %s, %pM, IRQ %d\n",
dev->name, np->name, print_mac(mac, dev->dev_addr), irq); dev->name, np->name, dev->dev_addr, irq);
if (tx_coalesce > 1) if (tx_coalesce > 1)
printk(KERN_INFO "tx_coalesce:\t%d packets\n", printk(KERN_INFO "tx_coalesce:\t%d packets\n",
tx_coalesce); tx_coalesce);
drivers/net/dm9000.c
+3 -5
View File
@@ -1385,13 +1385,11 @@ dm9000_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, ndev); platform_set_drvdata(pdev, ndev);
ret = register_netdev(ndev); ret = register_netdev(ndev);
if (ret == 0) { if (ret == 0)
DECLARE_MAC_BUF(mac); printk(KERN_INFO "%s: dm9000%c at %p,%p IRQ %d MAC: %pM (%s)\n",
printk(KERN_INFO "%s: dm9000%c at %p,%p IRQ %d MAC: %s (%s)\n",
ndev->name, dm9000_type_to_char(db->type), ndev->name, dm9000_type_to_char(db->type),
db->io_addr, db->io_data, ndev->irq, db->io_addr, db->io_data, ndev->irq,
print_mac(mac, ndev->dev_addr), mac_src); ndev->dev_addr, mac_src);
}
return 0; return 0;
out: out:
drivers/net/e100.c
+2 -3
View File
@@ -2616,7 +2616,6 @@ static int __devinit e100_probe(struct pci_dev *pdev,
struct net_device *netdev; struct net_device *netdev;
struct nic *nic; struct nic *nic;
int err; int err;
DECLARE_MAC_BUF(mac);
if(!(netdev = alloc_etherdev(sizeof(struct nic)))) { if(!(netdev = alloc_etherdev(sizeof(struct nic)))) {
if(((1 << debug) - 1) & NETIF_MSG_PROBE) if(((1 << debug) - 1) & NETIF_MSG_PROBE)
@@ -2746,9 +2745,9 @@ static int __devinit e100_probe(struct pci_dev *pdev,
goto err_out_free; goto err_out_free;
} }
DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %s\n", DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n",
(unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0), (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0),
pdev->irq, print_mac(mac, netdev->dev_addr)); pdev->irq, netdev->dev_addr);
return 0; return 0;
drivers/net/e1000/e1000_main.c
+1 -2
View File
@@ -912,7 +912,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
u16 eeprom_data = 0; u16 eeprom_data = 0;
u16 eeprom_apme_mask = E1000_EEPROM_APME; u16 eeprom_apme_mask = E1000_EEPROM_APME;
int bars, need_ioport; int bars, need_ioport;
DECLARE_MAC_BUF(mac);
/* do not allocate ioport bars when not needed */ /* do not allocate ioport bars when not needed */
need_ioport = e1000_is_need_ioport(pdev); need_ioport = e1000_is_need_ioport(pdev);
@@ -1194,7 +1193,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
(hw->bus_width == e1000_bus_width_pciex_1) ? "Width x1" : (hw->bus_width == e1000_bus_width_pciex_1) ? "Width x1" :
"32-bit")); "32-bit"));
printk("%s\n", print_mac(mac, netdev->dev_addr)); printk("%pM\n", netdev->dev_addr);
if (hw->bus_type == e1000_bus_type_pci_express) { if (hw->bus_type == e1000_bus_type_pci_express) {
DPRINTK(PROBE, WARNING, "This device (id %04x:%04x) will no " DPRINTK(PROBE, WARNING, "This device (id %04x:%04x) will no "
drivers/net/eepro.c
+1 -2
View File
@@ -690,7 +690,6 @@ static void __init eepro_print_info (struct net_device *dev)
struct eepro_local * lp = netdev_priv(dev); struct eepro_local * lp = netdev_priv(dev);
int i; int i;
const char * ifmap[] = {"AUI", "10Base2", "10BaseT"}; const char * ifmap[] = {"AUI", "10Base2", "10BaseT"};
DECLARE_MAC_BUF(mac);
i = inb(dev->base_addr + ID_REG); i = inb(dev->base_addr + ID_REG);
printk(KERN_DEBUG " id: %#x ",i); printk(KERN_DEBUG " id: %#x ",i);
@@ -715,7 +714,7 @@ static void __init eepro_print_info (struct net_device *dev)
break; break;
} }
printk(" %s", print_mac(mac, dev->dev_addr)); printk(" %pM", dev->dev_addr);
if (net_debug > 3) if (net_debug > 3)
printk(KERN_DEBUG ", %dK RCV buffer", printk(KERN_DEBUG ", %dK RCV buffer",
drivers/net/eepro100.c
+2 -3
View File
@@ -616,7 +616,6 @@ static int __devinit speedo_found1(struct pci_dev *pdev,
int size; int size;
void *tx_ring_space; void *tx_ring_space;
dma_addr_t tx_ring_dma; dma_addr_t tx_ring_dma;
DECLARE_MAC_BUF(mac);
size = TX_RING_SIZE * sizeof(struct TxFD) + sizeof(struct speedo_stats); size = TX_RING_SIZE * sizeof(struct TxFD) + sizeof(struct speedo_stats);
tx_ring_space = pci_alloc_consistent(pdev, size, &tx_ring_dma); tx_ring_space = pci_alloc_consistent(pdev, size, &tx_ring_dma);
@@ -700,8 +699,8 @@ static int __devinit speedo_found1(struct pci_dev *pdev,
else else
product = pci_name(pdev); product = pci_name(pdev);
printk(KERN_INFO "%s: %s, %s, IRQ %d.\n", dev->name, product, printk(KERN_INFO "%s: %s, %pM, IRQ %d.\n", dev->name, product,
print_mac(mac, dev->dev_addr), pdev->irq); dev->dev_addr, pdev->irq);
sp = netdev_priv(dev); sp = netdev_priv(dev);
drivers/net/enc28j60.c
+6 -10
View File
@@ -477,12 +477,10 @@ static int enc28j60_set_hw_macaddr(struct net_device *ndev)
mutex_lock(&priv->lock); mutex_lock(&priv->lock);
if (!priv->hw_enable) { if (!priv->hw_enable) {
if (netif_msg_drv(priv)) { if (netif_msg_drv(priv))
DECLARE_MAC_BUF(mac);
printk(KERN_INFO DRV_NAME printk(KERN_INFO DRV_NAME
": %s: Setting MAC address to %s\n", ": %s: Setting MAC address to %pM\n",
ndev->name, print_mac(mac, ndev->dev_addr)); ndev->name, ndev->dev_addr);
}
/* NOTE: MAC address in ENC28J60 is byte-backward */ /* NOTE: MAC address in ENC28J60 is byte-backward */
nolock_regb_write(priv, MAADR5, ndev->dev_addr[0]); nolock_regb_write(priv, MAADR5, ndev->dev_addr[0]);
nolock_regb_write(priv, MAADR4, ndev->dev_addr[1]); nolock_regb_write(priv, MAADR4, ndev->dev_addr[1]);
@@ -1328,11 +1326,9 @@ static int enc28j60_net_open(struct net_device *dev)
printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__); printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);
if (!is_valid_ether_addr(dev->dev_addr)) { if (!is_valid_ether_addr(dev->dev_addr)) {
if (netif_msg_ifup(priv)) { if (netif_msg_ifup(priv))
DECLARE_MAC_BUF(mac); dev_err(&dev->dev, "invalid MAC address %pM\n",
dev_err(&dev->dev, "invalid MAC address %s\n", dev->dev_addr);
print_mac(mac, dev->dev_addr));
}
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
} }
/* Reset the hardware here (and take it out of low power mode) */ /* Reset the hardware here (and take it out of low power mode) */
drivers/net/epic100.c
+2 -3
View File
@@ -322,7 +322,6 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
int i, ret, option = 0, duplex = 0; int i, ret, option = 0, duplex = 0;
void *ring_space; void *ring_space;
dma_addr_t ring_dma; dma_addr_t ring_dma;
DECLARE_MAC_BUF(mac);
/* when built into the kernel, we only print version if device is found */ /* when built into the kernel, we only print version if device is found */
#ifndef MODULE #ifndef MODULE
@@ -499,9 +498,9 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
if (ret < 0) if (ret < 0)
goto err_out_unmap_rx; goto err_out_unmap_rx;
printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %s\n", printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %pM\n",
dev->name, pci_id_tbl[chip_idx].name, ioaddr, dev->irq, dev->name, pci_id_tbl[chip_idx].name, ioaddr, dev->irq,
print_mac(mac, dev->dev_addr)); dev->dev_addr);
out: out:
return ret; return ret;
drivers/net/es3210.c
+4 -5
View File
@@ -179,7 +179,6 @@ static int __init es_probe1(struct net_device *dev, int ioaddr)
{ {
int i, retval; int i, retval;
unsigned long eisa_id; unsigned long eisa_id;
DECLARE_MAC_BUF(mac);
if (!request_region(ioaddr + ES_SA_PROM, ES_IO_EXTENT, "es3210")) if (!request_region(ioaddr + ES_SA_PROM, ES_IO_EXTENT, "es3210"))
return -ENODEV; return -ENODEV;
@@ -205,14 +204,14 @@ static int __init es_probe1(struct net_device *dev, int ioaddr)
if (dev->dev_addr[0] != ES_ADDR0 || if (dev->dev_addr[0] != ES_ADDR0 ||
dev->dev_addr[1] != ES_ADDR1 || dev->dev_addr[1] != ES_ADDR1 ||
dev->dev_addr[2] != ES_ADDR2) { dev->dev_addr[2] != ES_ADDR2) {
printk("es3210.c: card not found %s (invalid_prefix).\n", printk("es3210.c: card not found %pM (invalid_prefix).\n",
print_mac(mac, dev->dev_addr)); dev->dev_addr);
retval = -ENODEV; retval = -ENODEV;
goto out; goto out;
} }
printk("es3210.c: ES3210 rev. %ld at %#x, node %s", printk("es3210.c: ES3210 rev. %ld at %#x, node %pM",
eisa_id>>24, ioaddr, print_mac(mac, dev->dev_addr)); eisa_id>>24, ioaddr, dev->dev_addr);
/* Snarf the interrupt now. */ /* Snarf the interrupt now. */
if (dev->irq == 0) { if (dev->irq == 0) {
drivers/net/ewrk3.c
+2 -5
View File
@@ -396,7 +396,6 @@ ewrk3_hw_init(struct net_device *dev, u_long iobase)
u_long mem_start, shmem_length; u_long mem_start, shmem_length;
u_char cr, cmr, icr, nicsr, lemac, hard_strapped = 0; u_char cr, cmr, icr, nicsr, lemac, hard_strapped = 0;
u_char eeprom_image[EEPROM_MAX], chksum, eisa_cr = 0; u_char eeprom_image[EEPROM_MAX], chksum, eisa_cr = 0;
DECLARE_MAC_BUF(mac);
/* /*
** Stop the EWRK3. Enable the DBR ROM. Disable interrupts and remote boot. ** Stop the EWRK3. Enable the DBR ROM. Disable interrupts and remote boot.
@@ -461,7 +460,7 @@ ewrk3_hw_init(struct net_device *dev, u_long iobase)
if (lemac != LeMAC2) if (lemac != LeMAC2)
DevicePresent(iobase); /* need after EWRK3_INIT */ DevicePresent(iobase); /* need after EWRK3_INIT */
status = get_hw_addr(dev, eeprom_image, lemac); status = get_hw_addr(dev, eeprom_image, lemac);
printk("%s\n", print_mac(mac, dev->dev_addr)); printk("%pM\n", dev->dev_addr);
if (status) { if (status) {
printk(" which has an EEPROM CRC error.\n"); printk(" which has an EEPROM CRC error.\n");
@@ -646,10 +645,8 @@ static int ewrk3_open(struct net_device *dev)
ewrk3_init(dev); ewrk3_init(dev);
if (ewrk3_debug > 1) { if (ewrk3_debug > 1) {
DECLARE_MAC_BUF(mac);
printk("%s: ewrk3 open with irq %d\n", dev->name, dev->irq); printk("%s: ewrk3 open with irq %d\n", dev->name, dev->irq);
printk(" physical address: %s\n", printk(" physical address: %pM\n", dev->dev_addr);
print_mac(mac, dev->dev_addr));
if (lp->shmem_length == 0) { if (lp->shmem_length == 0) {
printk(" no shared memory, I/O only mode\n"); printk(" no shared memory, I/O only mode\n");
} else { } else {
drivers/net/fealnx.c
+2 -3
View File
@@ -486,7 +486,6 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,
#else #else
int bar = 1; int bar = 1;
#endif #endif
DECLARE_MAC_BUF(mac);
/* when built into the kernel, we only print version if device is found */ /* when built into the kernel, we only print version if device is found */
#ifndef MODULE #ifndef MODULE
@@ -665,9 +664,9 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,
if (err) if (err)
goto err_out_free_tx; goto err_out_free_tx;
printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n", printk(KERN_INFO "%s: %s at %p, %pM, IRQ %d.\n",
dev->name, skel_netdrv_tbl[chip_id].chip_name, ioaddr, dev->name, skel_netdrv_tbl[chip_id].chip_name, ioaddr,
print_mac(mac, dev->dev_addr), irq); dev->dev_addr, irq);
return 0; return 0;
drivers/net/fec.c
+1 -3
View File
@@ -2562,7 +2562,6 @@ static int __init fec_enet_module_init(void)
{ {
struct net_device *dev; struct net_device *dev;
int i, err; int i, err;
DECLARE_MAC_BUF(mac);
printk("FEC ENET Version 0.2\n"); printk("FEC ENET Version 0.2\n");
@@ -2581,8 +2580,7 @@ static int __init fec_enet_module_init(void)
return -EIO; return -EIO;
} }
printk("%s: ethernet %s\n", printk("%s: ethernet %pM\n", dev->name, dev->dev_addr);
dev->name, print_mac(mac, dev->dev_addr));
} }
return 0; return 0;
} }
drivers/net/forcedeth.c
+4 -5
View File
@@ -5420,7 +5420,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
u32 powerstate, txreg; u32 powerstate, txreg;
u32 phystate_orig = 0, phystate; u32 phystate_orig = 0, phystate;
int phyinitialized = 0; int phyinitialized = 0;
DECLARE_MAC_BUF(mac);
static int printed_version; static int printed_version;
if (!printed_version++) if (!printed_version++)
@@ -5653,8 +5652,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
* to 01:23:45:67:89:ab * to 01:23:45:67:89:ab
*/ */
dev_printk(KERN_ERR, &pci_dev->dev, dev_printk(KERN_ERR, &pci_dev->dev,
"Invalid Mac address detected: %s\n", "Invalid Mac address detected: %pM\n",
print_mac(mac, dev->dev_addr)); dev->dev_addr);
dev_printk(KERN_ERR, &pci_dev->dev, dev_printk(KERN_ERR, &pci_dev->dev,
"Please complain to your hardware vendor. Switching to a random MAC.\n"); "Please complain to your hardware vendor. Switching to a random MAC.\n");
dev->dev_addr[0] = 0x00; dev->dev_addr[0] = 0x00;
@@ -5663,8 +5662,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
get_random_bytes(&dev->dev_addr[3], 3); get_random_bytes(&dev->dev_addr[3], 3);
} }
dprintk(KERN_DEBUG "%s: MAC Address %s\n", dprintk(KERN_DEBUG "%s: MAC Address %pM\n",
pci_name(pci_dev), print_mac(mac, dev->dev_addr)); pci_name(pci_dev), dev->dev_addr);
/* set mac address */ /* set mac address */
nv_copy_mac_to_hw(dev); nv_copy_mac_to_hw(dev);
drivers/net/gianfar.c
+1 -3
View File
@@ -162,7 +162,6 @@ static int gfar_probe(struct platform_device *pdev)
struct gianfar_platform_data *einfo; struct gianfar_platform_data *einfo;
struct resource *r; struct resource *r;
int err = 0, irq; int err = 0, irq;
DECLARE_MAC_BUF(mac);
einfo = (struct gianfar_platform_data *) pdev->dev.platform_data; einfo = (struct gianfar_platform_data *) pdev->dev.platform_data;
@@ -364,8 +363,7 @@ static int gfar_probe(struct platform_device *pdev)
gfar_init_sysfs(dev); gfar_init_sysfs(dev);
/* Print out the device info */ /* Print out the device info */
printk(KERN_INFO DEVICE_NAME "%s\n", printk(KERN_INFO DEVICE_NAME "%pM\n", dev->name, dev->dev_addr);
dev->name, print_mac(mac, dev->dev_addr));
/* Even more device info helps when determining which kernel */ /* Even more device info helps when determining which kernel */
/* provided which set of benchmarks. */ /* provided which set of benchmarks. */
drivers/net/hamachi.c
+2 -3
View File
@@ -582,7 +582,6 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
void *ring_space; void *ring_space;
dma_addr_t ring_dma; dma_addr_t ring_dma;
int ret = -ENOMEM; int ret = -ENOMEM;
DECLARE_MAC_BUF(mac);
/* when built into the kernel, we only print version if device is found */ /* when built into the kernel, we only print version if device is found */
#ifndef MODULE #ifndef MODULE
@@ -744,9 +743,9 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
goto err_out_unmap_rx; goto err_out_unmap_rx;
} }
printk(KERN_INFO "%s: %s type %x at %p, %s, IRQ %d.\n", printk(KERN_INFO "%s: %s type %x at %p, %pM, IRQ %d.\n",
dev->name, chip_tbl[chip_id].name, readl(ioaddr + ChipRev), dev->name, chip_tbl[chip_id].name, readl(ioaddr + ChipRev),
ioaddr, print_mac(mac, dev->dev_addr), irq); ioaddr, dev->dev_addr, irq);
i = readb(ioaddr + PCIClkMeas); i = readb(ioaddr + PCIClkMeas);
printk(KERN_INFO "%s: %d-bit %d Mhz PCI bus (%d), Virtual Jumpers " printk(KERN_INFO "%s: %d-bit %d Mhz PCI bus (%d), Virtual Jumpers "
"%2.2x, LPA %4.4x.\n", "%2.2x, LPA %4.4x.\n",
drivers/net/hamradio/bpqether.c
+3 -4
View File
@@ -441,16 +441,15 @@ static int bpq_seq_show(struct seq_file *seq, void *v)
"dev ether destination accept from\n"); "dev ether destination accept from\n");
else { else {
const struct bpqdev *bpqdev = v; const struct bpqdev *bpqdev = v;
DECLARE_MAC_BUF(mac);
seq_printf(seq, "%-5s %-10s %s ", seq_printf(seq, "%-5s %-10s %pM ",
bpqdev->axdev->name, bpqdev->ethdev->name, bpqdev->axdev->name, bpqdev->ethdev->name,
print_mac(mac, bpqdev->dest_addr)); bpqdev->dest_addr);
if (is_multicast_ether_addr(bpqdev->acpt_addr)) if (is_multicast_ether_addr(bpqdev->acpt_addr))
seq_printf(seq, "*\n"); seq_printf(seq, "*\n");
else else
seq_printf(seq, "%s\n", print_mac(mac, bpqdev->acpt_addr)); seq_printf(seq, "%pM\n", bpqdev->acpt_addr);
} }
return 0; return 0;
drivers/net/hp-plus.c
+1 -2
View File
@@ -166,7 +166,6 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
const char name[] = "HP-PC-LAN+"; const char name[] = "HP-PC-LAN+";
int mem_start; int mem_start;
static unsigned version_printed; static unsigned version_printed;
DECLARE_MAC_BUF(mac);
if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME)) if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME))
return -EBUSY; return -EBUSY;
@@ -193,7 +192,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
} }
checksum += inb(ioaddr + 14); checksum += inb(ioaddr + 14);
printk("%s", print_mac(mac, dev->dev_addr)); printk("%pM", dev->dev_addr);
if (checksum != 0xff) { if (checksum != 0xff) {
printk(" bad checksum %2.2x.\n", checksum); printk(" bad checksum %2.2x.\n", checksum);
drivers/net/hp.c
+1 -2
View File
@@ -127,7 +127,6 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
int i, retval, board_id, wordmode; int i, retval, board_id, wordmode;
const char *name; const char *name;
static unsigned version_printed; static unsigned version_printed;
DECLARE_MAC_BUF(mac);
if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME)) if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME))
return -EBUSY; return -EBUSY;
@@ -161,7 +160,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
for(i = 0; i < ETHER_ADDR_LEN; i++) for(i = 0; i < ETHER_ADDR_LEN; i++)
dev->dev_addr[i] = inb(ioaddr + i); dev->dev_addr[i] = inb(ioaddr + i);
printk(" %s", print_mac(mac, dev->dev_addr)); printk(" %pM", dev->dev_addr);
/* Snarf the interrupt now. Someday this could be moved to open(). */ /* Snarf the interrupt now. Someday this could be moved to open(). */
if (dev->irq < 2) { if (dev->irq < 2) {
drivers/net/hp100.c
+2 -3
View File
@@ -2093,9 +2093,8 @@ static void hp100_set_multicast_list(struct net_device *dev)
addrs = dmi->dmi_addr; addrs = dmi->dmi_addr;
if ((*addrs & 0x01) == 0x01) { /* multicast address? */ if ((*addrs & 0x01) == 0x01) { /* multicast address? */
#ifdef HP100_DEBUG #ifdef HP100_DEBUG
DECLARE_MAC_BUF(mac); printk("hp100: %s: multicast = %pM, ",
printk("hp100: %s: multicast = %s, ", dev->name, addrs);
dev->name, print_mac(mac, addrs));
#endif #endif
for (j = idx = 0; j < 6; j++) { for (j = idx = 0; j < 6; j++) {
idx ^= *addrs++ & 0x3f; idx ^= *addrs++ & 0x3f;
drivers/net/hydra.c
+2 -3
View File
@@ -103,7 +103,6 @@ static int __devinit hydra_init(struct zorro_dev *z)
int start_page, stop_page; int start_page, stop_page;
int j; int j;
int err; int err;
DECLARE_MAC_BUF(mac);
static u32 hydra_offsets[16] = { static u32 hydra_offsets[16] = {
0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e,
@@ -163,8 +162,8 @@ static int __devinit hydra_init(struct zorro_dev *z)
zorro_set_drvdata(z, dev); zorro_set_drvdata(z, dev);
printk(KERN_INFO "%s: Hydra at 0x%08lx, address " printk(KERN_INFO "%s: Hydra at 0x%08lx, address "
"%s (hydra.c " HYDRA_VERSION ")\n", "%pM (hydra.c " HYDRA_VERSION ")\n",
dev->name, z->resource.start, print_mac(mac, dev->dev_addr)); dev->name, z->resource.start, dev->dev_addr);
return 0; return 0;
} }
drivers/net/ibmlana.c
+2 -3
View File
@@ -914,7 +914,6 @@ static int __devinit ibmlana_init_one(struct device *kdev)
int base = 0, irq = 0, iobase = 0, memlen = 0; int base = 0, irq = 0, iobase = 0, memlen = 0;
ibmlana_priv *priv; ibmlana_priv *priv;
ibmlana_medium medium; ibmlana_medium medium;
DECLARE_MAC_BUF(mac);
dev = alloc_etherdev(sizeof(ibmlana_priv)); dev = alloc_etherdev(sizeof(ibmlana_priv));
if (!dev) if (!dev)
@@ -990,10 +989,10 @@ static int __devinit ibmlana_init_one(struct device *kdev)
/* print config */ /* print config */
printk(KERN_INFO "%s: IRQ %d, I/O %#lx, memory %#lx-%#lx, " printk(KERN_INFO "%s: IRQ %d, I/O %#lx, memory %#lx-%#lx, "
"MAC address %s.\n", "MAC address %pM.\n",
dev->name, priv->realirq, dev->base_addr, dev->name, priv->realirq, dev->base_addr,
dev->mem_start, dev->mem_end - 1, dev->mem_start, dev->mem_end - 1,
print_mac(mac, dev->dev_addr)); dev->dev_addr);
printk(KERN_INFO "%s: %s medium\n", dev->name, MediaNames[priv->medium]); printk(KERN_INFO "%s: %s medium\n", dev->name, MediaNames[priv->medium]);
/* reset board */ /* reset board */
drivers/net/ibmveth.c
+2 -3
View File
@@ -1371,13 +1371,12 @@ static int ibmveth_show(struct seq_file *seq, void *v)
struct ibmveth_adapter *adapter = seq->private; struct ibmveth_adapter *adapter = seq->private;
char *current_mac = ((char*) &adapter->netdev->dev_addr); char *current_mac = ((char*) &adapter->netdev->dev_addr);
char *firmware_mac = ((char*) &adapter->mac_addr) ; char *firmware_mac = ((char*) &adapter->mac_addr) ;
DECLARE_MAC_BUF(mac);
seq_printf(seq, "%s %s\n\n", ibmveth_driver_string, ibmveth_driver_version); seq_printf(seq, "%s %s\n\n", ibmveth_driver_string, ibmveth_driver_version);
seq_printf(seq, "Unit Address: 0x%x\n", adapter->vdev->unit_address); seq_printf(seq, "Unit Address: 0x%x\n", adapter->vdev->unit_address);
seq_printf(seq, "Current MAC: %s\n", print_mac(mac, current_mac)); seq_printf(seq, "Current MAC: %pM\n", current_mac);
seq_printf(seq, "Firmware MAC: %s\n", print_mac(mac, firmware_mac)); seq_printf(seq, "Firmware MAC: %pM\n", firmware_mac);
seq_printf(seq, "\nAdapter Statistics:\n"); seq_printf(seq, "\nAdapter Statistics:\n");
seq_printf(seq, " TX: vio_map_single failres: %ld\n", adapter->tx_map_failed); seq_printf(seq, " TX: vio_map_single failres: %ld\n", adapter->tx_map_failed);
drivers/net/ioc3-eth.c
+1 -4
View File
@@ -443,12 +443,9 @@ static void ioc3_get_eaddr_nic(struct ioc3_private *ip)
*/ */
static void ioc3_get_eaddr(struct ioc3_private *ip) static void ioc3_get_eaddr(struct ioc3_private *ip)
{ {
DECLARE_MAC_BUF(mac);
ioc3_get_eaddr_nic(ip); ioc3_get_eaddr_nic(ip);
printk("Ethernet address is %s.\n", printk("Ethernet address is %pM.\n", priv_netdev(ip)->dev_addr);
print_mac(mac, priv_netdev(ip)->dev_addr));
} }
static void __ioc3_set_mac_address(struct net_device *dev) static void __ioc3_set_mac_address(struct net_device *dev)
drivers/net/isa-skeleton.c
+1 -2
View File
@@ -192,7 +192,6 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
static unsigned version_printed; static unsigned version_printed;
int i; int i;
int err = -ENODEV; int err = -ENODEV;
DECLARE_MAC_BUF(mac);
/* Grab the region so that no one else tries to probe our ioports. */ /* Grab the region so that no one else tries to probe our ioports. */
if (!request_region(ioaddr, NETCARD_IO_EXTENT, cardname)) if (!request_region(ioaddr, NETCARD_IO_EXTENT, cardname))
@@ -220,7 +219,7 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
dev->dev_addr[i] = inb(ioaddr + i); dev->dev_addr[i] = inb(ioaddr + i);
printk("%s", print_mac(mac, dev->dev_addr)); printk("%pM", dev->dev_addr);
err = -EAGAIN; err = -EAGAIN;
#ifdef jumpered_interrupts #ifdef jumpered_interrupts
drivers/net/jazzsonic.c
+1 -3
View File
@@ -208,7 +208,6 @@ static int __init jazz_sonic_probe(struct platform_device *pdev)
struct sonic_local *lp; struct sonic_local *lp;
struct resource *res; struct resource *res;
int err = 0; int err = 0;
DECLARE_MAC_BUF(mac);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) if (!res)
@@ -233,8 +232,7 @@ static int __init jazz_sonic_probe(struct platform_device *pdev)
if (err) if (err)
goto out1; goto out1;
printk("%s: MAC %s IRQ %d\n", printk("%s: MAC %pM IRQ %d\n", dev->name, dev->dev_addr, dev->irq);
dev->name, print_mac(mac, dev->dev_addr), dev->irq);
return 0; return 0;
drivers/net/lance.c
+1 -2
View File
@@ -466,7 +466,6 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int
unsigned long flags; unsigned long flags;
int err = -ENOMEM; int err = -ENOMEM;
void __iomem *bios; void __iomem *bios;
DECLARE_MAC_BUF(mac);
/* First we look for special cases. /* First we look for special cases.
Check for HP's on-board ethernet by looking for 'HP' in the BIOS. Check for HP's on-board ethernet by looking for 'HP' in the BIOS.
@@ -529,7 +528,7 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int
The first six bytes are the station address. */ The first six bytes are the station address. */
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
dev->dev_addr[i] = inb(ioaddr + i); dev->dev_addr[i] = inb(ioaddr + i);
printk("%s", print_mac(mac, dev->dev_addr)); printk("%pM", dev->dev_addr);
dev->base_addr = ioaddr; dev->base_addr = ioaddr;
/* Make certain the data structures used by the LANCE are aligned and DMAble. */ /* Make certain the data structures used by the LANCE are aligned and DMAble. */
drivers/net/lib82596.c
+4 -9
View File
@@ -1034,12 +1034,8 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
static void print_eth(unsigned char *add, char *str) static void print_eth(unsigned char *add, char *str)
{ {
DECLARE_MAC_BUF(mac); printk(KERN_DEBUG "i596 0x%p, %pM --> %pM %02X%02X, %s\n",
DECLARE_MAC_BUF(mac2); add, add + 6, add, add[12], add[13], str);
printk(KERN_DEBUG "i596 0x%p, %s --> %s %02X%02X, %s\n",
add, print_mac(mac, add + 6), print_mac(mac2, add),
add[12], add[13], str);
} }
static int __devinit i82596_probe(struct net_device *dev) static int __devinit i82596_probe(struct net_device *dev)
@@ -1343,7 +1339,6 @@ static void set_multicast_list(struct net_device *dev)
struct i596_private *lp = netdev_priv(dev); struct i596_private *lp = netdev_priv(dev);
struct i596_dma *dma = lp->dma; struct i596_dma *dma = lp->dma;
int config = 0, cnt; int config = 0, cnt;
DECLARE_MAC_BUF(mac);
DEB(DEB_MULTI, DEB(DEB_MULTI,
printk(KERN_DEBUG printk(KERN_DEBUG
@@ -1407,8 +1402,8 @@ static void set_multicast_list(struct net_device *dev)
if (i596_debug > 1) if (i596_debug > 1)
DEB(DEB_MULTI, DEB(DEB_MULTI,
printk(KERN_DEBUG printk(KERN_DEBUG
"%s: Adding address %s\n", "%s: Adding address %pM\n",
dev->name, print_mac(mac, cp))); dev->name, cp));
} }
DMA_WBACK_INV(dev, &dma->mc_cmd, sizeof(struct mc_cmd)); DMA_WBACK_INV(dev, &dma->mc_cmd, sizeof(struct mc_cmd));
i596_add_cmd(dev, &cmd->cmd); i596_add_cmd(dev, &cmd->cmd);
drivers/net/lne390.c
+2 -3
View File
@@ -169,7 +169,6 @@ static int __init lne390_probe1(struct net_device *dev, int ioaddr)
{ {
int i, revision, ret; int i, revision, ret;
unsigned long eisa_id; unsigned long eisa_id;
DECLARE_MAC_BUF(mac);
if (inb_p(ioaddr + LNE390_ID_PORT) == 0xff) return -ENODEV; if (inb_p(ioaddr + LNE390_ID_PORT) == 0xff) return -ENODEV;
@@ -203,8 +202,8 @@ static int __init lne390_probe1(struct net_device *dev, int ioaddr)
for(i = 0; i < ETHER_ADDR_LEN; i++) for(i = 0; i < ETHER_ADDR_LEN; i++)
dev->dev_addr[i] = inb(ioaddr + LNE390_SA_PROM + i); dev->dev_addr[i] = inb(ioaddr + LNE390_SA_PROM + i);
printk("lne390.c: LNE390%X in EISA slot %d, address %s.\n", printk("lne390.c: LNE390%X in EISA slot %d, address %pM.\n",
0xa+revision, ioaddr/0x1000, print_mac(mac, dev->dev_addr)); 0xa+revision, ioaddr/0x1000, dev->dev_addr);
printk("lne390.c: "); printk("lne390.c: ");
drivers/net/mac89x0.c
+1 -3
View File
@@ -181,7 +181,6 @@ struct net_device * __init mac89x0_probe(int unit)
unsigned long ioaddr; unsigned long ioaddr;
unsigned short sig; unsigned short sig;
int err = -ENODEV; int err = -ENODEV;
DECLARE_MAC_BUF(mac);
if (!MACH_IS_MAC) if (!MACH_IS_MAC)
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
@@ -279,8 +278,7 @@ struct net_device * __init mac89x0_probe(int unit)
/* print the IRQ and ethernet address. */ /* print the IRQ and ethernet address. */
printk(" IRQ %d ADDR %s\n", printk(" IRQ %d ADDR %pM\n", dev->irq, dev->dev_addr);
dev->irq, print_mac(mac, dev->dev_addr));
dev->open = net_open; dev->open = net_open;
dev->stop = net_close; dev->stop = net_close;
drivers/net/macb.c
+2 -5
View File
@@ -1104,7 +1104,6 @@ static int __init macb_probe(struct platform_device *pdev)
unsigned long pclk_hz; unsigned long pclk_hz;
u32 config; u32 config;
int err = -ENXIO; int err = -ENXIO;
DECLARE_MAC_BUF(mac);
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!regs) { if (!regs) {
@@ -1223,10 +1222,8 @@ static int __init macb_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, dev); platform_set_drvdata(pdev, dev);
printk(KERN_INFO "%s: Atmel MACB at 0x%08lx irq %d " printk(KERN_INFO "%s: Atmel MACB at 0x%08lx irq %d (%pM)\n",
"(%s)\n", dev->name, dev->base_addr, dev->irq, dev->dev_addr);
dev->name, dev->base_addr, dev->irq,
print_mac(mac, dev->dev_addr));
phydev = bp->phy_dev; phydev = bp->phy_dev;
printk(KERN_INFO "%s: attached PHY driver [%s] " printk(KERN_INFO "%s: attached PHY driver [%s] "
drivers/net/mace.c
+2 -3
View File
@@ -101,7 +101,6 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
struct mace_data *mp; struct mace_data *mp;
const unsigned char *addr; const unsigned char *addr;
int j, rev, rc = -EBUSY; int j, rev, rc = -EBUSY;
DECLARE_MAC_BUF(mac);
if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) { if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) {
printk(KERN_ERR "can't use MACE %s: need 3 addrs and 3 irqs\n", printk(KERN_ERR "can't use MACE %s: need 3 addrs and 3 irqs\n",
@@ -241,8 +240,8 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
goto err_free_rx_irq; goto err_free_rx_irq;
} }
printk(KERN_INFO "%s: MACE at %s, chip revision %d.%d\n", printk(KERN_INFO "%s: MACE at %pM, chip revision %d.%d\n",
dev->name, print_mac(mac, dev->dev_addr), dev->name, dev->dev_addr,
mp->chipid >> 8, mp->chipid & 0xff); mp->chipid >> 8, mp->chipid & 0xff);
return 0; return 0;
drivers/net/macmace.c
+2 -3
View File
@@ -194,7 +194,6 @@ static int __devinit mace_probe(struct platform_device *pdev)
unsigned char checksum = 0; unsigned char checksum = 0;
static int found = 0; static int found = 0;
int err; int err;
DECLARE_MAC_BUF(mac);
if (found || macintosh_config->ether_type != MAC_ETHER_MACE) if (found || macintosh_config->ether_type != MAC_ETHER_MACE)
return -ENODEV; return -ENODEV;
@@ -249,8 +248,8 @@ static int __devinit mace_probe(struct platform_device *pdev)
dev->set_multicast_list = mace_set_multicast; dev->set_multicast_list = mace_set_multicast;
dev->set_mac_address = mace_set_address; dev->set_mac_address = mace_set_address;
printk(KERN_INFO "%s: 68K MACE, hardware address %s\n", printk(KERN_INFO "%s: 68K MACE, hardware address %pM\n",
dev->name, print_mac(mac, dev->dev_addr)); dev->name, dev->dev_addr);
err = register_netdev(dev); err = register_netdev(dev);
if (!err) if (!err)
drivers/net/macsonic.c
+3 -6
View File
@@ -220,7 +220,6 @@ static int __init mac_onboard_sonic_ethernet_addr(struct net_device *dev)
struct sonic_local *lp = netdev_priv(dev); struct sonic_local *lp = netdev_priv(dev);
const int prom_addr = ONBOARD_SONIC_PROM_BASE; const int prom_addr = ONBOARD_SONIC_PROM_BASE;
int i; int i;
DECLARE_MAC_BUF(mac);
/* On NuBus boards we can sometimes look in the ROM resources. /* On NuBus boards we can sometimes look in the ROM resources.
No such luck for comm-slot/onboard. */ No such luck for comm-slot/onboard. */
@@ -264,8 +263,8 @@ static int __init mac_onboard_sonic_ethernet_addr(struct net_device *dev)
dev->dev_addr[1] = val >> 8; dev->dev_addr[1] = val >> 8;
dev->dev_addr[0] = val & 0xff; dev->dev_addr[0] = val & 0xff;
printk(KERN_INFO "HW Address from CAM 15: %s\n", printk(KERN_INFO "HW Address from CAM 15: %pM\n",
print_mac(mac, dev->dev_addr)); dev->dev_addr);
} else return 0; } else return 0;
if (memcmp(dev->dev_addr, "\x08\x00\x07", 3) && if (memcmp(dev->dev_addr, "\x08\x00\x07", 3) &&
@@ -560,7 +559,6 @@ static int __init mac_sonic_probe(struct platform_device *pdev)
struct net_device *dev; struct net_device *dev;
struct sonic_local *lp; struct sonic_local *lp;
int err; int err;
DECLARE_MAC_BUF(mac);
dev = alloc_etherdev(sizeof(struct sonic_local)); dev = alloc_etherdev(sizeof(struct sonic_local));
if (!dev) if (!dev)
@@ -584,8 +582,7 @@ found:
if (err) if (err)
goto out; goto out;
printk("%s: MAC %s IRQ %d\n", printk("%s: MAC %pM IRQ %d\n", dev->name, dev->dev_addr, dev->irq);
dev->name, print_mac(mac, dev->dev_addr), dev->irq);
return 0; return 0;
drivers/net/meth.c
+1 -2
View File
@@ -94,10 +94,9 @@ char o2meth_eaddr[8]={0,0,0,0,0,0,0,0};
static inline void load_eaddr(struct net_device *dev) static inline void load_eaddr(struct net_device *dev)
{ {
int i; int i;
DECLARE_MAC_BUF(mac);
u64 macaddr; u64 macaddr;
DPRINTK("Loading MAC Address: %s\n", print_mac(mac, dev->dev_addr)); DPRINTK("Loading MAC Address: %pM\n", dev->dev_addr);
macaddr = 0; macaddr = 0;
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
macaddr |= (u64)dev->dev_addr[i] << ((5 - i) * 8); macaddr |= (u64)dev->dev_addr[i] << ((5 - i) * 8);
drivers/net/mv643xx_eth.c
+2 -3
View File
@@ -2589,7 +2589,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
struct mv643xx_eth_private *mp; struct mv643xx_eth_private *mp;
struct net_device *dev; struct net_device *dev;
struct resource *res; struct resource *res;
DECLARE_MAC_BUF(mac);
int err; int err;
pd = pdev->dev.platform_data; pd = pdev->dev.platform_data;
@@ -2683,8 +2682,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
if (err) if (err)
goto out; goto out;
dev_printk(KERN_NOTICE, &dev->dev, "port %d with MAC address %s\n", dev_printk(KERN_NOTICE, &dev->dev, "port %d with MAC address %pM\n",
mp->port_num, print_mac(mac, dev->dev_addr)); mp->port_num, dev->dev_addr);
if (mp->tx_desc_sram_size > 0) if (mp->tx_desc_sram_size > 0)
dev_printk(KERN_NOTICE, &dev->dev, "configured with sram\n"); dev_printk(KERN_NOTICE, &dev->dev, "configured with sram\n");
drivers/net/mvme147.c
+2 -3
View File
@@ -67,7 +67,6 @@ struct net_device * __init mvme147lance_probe(int unit)
u_long *addr; u_long *addr;
u_long address; u_long address;
int err; int err;
DECLARE_MAC_BUF(mac);
if (!MACH_IS_MVME147 || called) if (!MACH_IS_MVME147 || called)
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
@@ -102,9 +101,9 @@ struct net_device * __init mvme147lance_probe(int unit)
dev->dev_addr[3]=address&0xff; dev->dev_addr[3]=address&0xff;
printk("%s: MVME147 at 0x%08lx, irq %d, " printk("%s: MVME147 at 0x%08lx, irq %d, "
"Hardware Address %s\n", "Hardware Address %pM\n",
dev->name, dev->base_addr, MVME147_LANCE_IRQ, dev->name, dev->base_addr, MVME147_LANCE_IRQ,
print_mac(mac, dev->dev_addr)); dev->dev_addr);
lp = (struct m147lance_private *)dev->priv; lp = (struct m147lance_private *)dev->priv;
lp->ram = __get_dma_pages(GFP_ATOMIC, 3); /* 16K */ lp->ram = __get_dma_pages(GFP_ATOMIC, 3); /* 16K */
drivers/net/myri10ge/myri10ge.c
+1 -3
View File
@@ -2981,7 +2981,6 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
struct dev_mc_list *mc_list; struct dev_mc_list *mc_list;
__be32 data[2] = { 0, 0 }; __be32 data[2] = { 0, 0 };
int err; int err;
DECLARE_MAC_BUF(mac);
/* can be called from atomic contexts, /* can be called from atomic contexts,
* pass 1 to force atomicity in myri10ge_send_cmd() */ * pass 1 to force atomicity in myri10ge_send_cmd() */
@@ -3028,8 +3027,7 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
printk(KERN_ERR "myri10ge: %s: Failed " printk(KERN_ERR "myri10ge: %s: Failed "
"MXGEFW_JOIN_MULTICAST_GROUP, error status:" "MXGEFW_JOIN_MULTICAST_GROUP, error status:"
"%d\t", dev->name, err); "%d\t", dev->name, err);
printk(KERN_ERR "MAC %s\n", printk(KERN_ERR "MAC %pM\n", mc_list->dmi_addr);
print_mac(mac, mc_list->dmi_addr));
goto abort; goto abort;
} }
} }
drivers/net/myri_sbus.c
+5 -9
View File
@@ -318,13 +318,10 @@ static void myri_is_not_so_happy(struct myri_eth *mp)
#ifdef DEBUG_HEADER #ifdef DEBUG_HEADER
static void dump_ehdr(struct ethhdr *ehdr) static void dump_ehdr(struct ethhdr *ehdr)
{ {
DECLARE_MAC_BUF(mac); printk("ehdr[h_dst(%pM)"
DECLARE_MAC_BUF(mac2); "h_source(%pM)"
printk("ehdr[h_dst(%s)"
"h_source(%s)"
"h_proto(%04x)]\n", "h_proto(%04x)]\n",
print_mac(mac, ehdr->h_dest), print_mac(mac2, ehdr->h_source), ehdr->h_dest, ehdr->h_source, ehdr->h_proto);
ehdr->h_proto);
} }
static void dump_ehdr_and_myripad(unsigned char *stuff) static void dump_ehdr_and_myripad(unsigned char *stuff)
@@ -905,7 +902,6 @@ static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic
struct device_node *dp = op->node; struct device_node *dp = op->node;
static unsigned version_printed; static unsigned version_printed;
struct net_device *dev; struct net_device *dev;
DECLARE_MAC_BUF(mac);
struct myri_eth *mp; struct myri_eth *mp;
const void *prop; const void *prop;
static int num; static int num;
@@ -1088,8 +1084,8 @@ static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic
num++; num++;
printk("%s: MyriCOM MyriNET Ethernet %s\n", printk("%s: MyriCOM MyriNET Ethernet %pM\n",
dev->name, print_mac(mac, dev->dev_addr)); dev->name, dev->dev_addr);
return 0; return 0;
drivers/net/natsemi.c
+2 -3
View File
@@ -792,7 +792,6 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
const int pcibar = 1; /* PCI base address register */ const int pcibar = 1; /* PCI base address register */
int prev_eedata; int prev_eedata;
u32 tmp; u32 tmp;
DECLARE_MAC_BUF(mac);
/* when built into the kernel, we only print version if device is found */ /* when built into the kernel, we only print version if device is found */
#ifndef MODULE #ifndef MODULE
@@ -948,10 +947,10 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
if (netif_msg_drv(np)) { if (netif_msg_drv(np)) {
printk(KERN_INFO "natsemi %s: %s at %#08llx " printk(KERN_INFO "natsemi %s: %s at %#08llx "
"(%s), %s, IRQ %d", "(%s), %pM, IRQ %d",
dev->name, natsemi_pci_info[chip_idx].name, dev->name, natsemi_pci_info[chip_idx].name,
(unsigned long long)iostart, pci_name(np->pci_dev), (unsigned long long)iostart, pci_name(np->pci_dev),
print_mac(mac, dev->dev_addr), irq); dev->dev_addr, irq);
if (dev->if_port == PORT_TP) if (dev->if_port == PORT_TP)
printk(", port TP.\n"); printk(", port TP.\n");
else if (np->ignore_phy) else if (np->ignore_phy)
drivers/net/ne-h8300.c
+1 -2
View File
@@ -204,7 +204,6 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
static unsigned version_printed; static unsigned version_printed;
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
unsigned char bus_width; unsigned char bus_width;
DECLARE_MAC_BUF(mac);
if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME)) if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME))
return -EBUSY; return -EBUSY;
@@ -299,7 +298,7 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
for(i = 0; i < ETHER_ADDR_LEN; i++) for(i = 0; i < ETHER_ADDR_LEN; i++)
dev->dev_addr[i] = SA_prom[i]; dev->dev_addr[i] = SA_prom[i];
printk(" %s\n", print_mac(mac, dev->dev_addr)); printk(" %pM\n", dev->dev_addr);
printk("%s: %s found at %#x, using IRQ %d.\n", printk("%s: %s found at %#x, using IRQ %d.\n",
dev->name, name, ioaddr, dev->irq); dev->name, name, ioaddr, dev->irq);
drivers/net/ne.c
+1 -2
View File
@@ -297,7 +297,6 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
int neX000, ctron, copam, bad_card; int neX000, ctron, copam, bad_card;
int reg0, ret; int reg0, ret;
static unsigned version_printed; static unsigned version_printed;
DECLARE_MAC_BUF(mac);
if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME)) if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME))
return -EBUSY; return -EBUSY;
@@ -517,7 +516,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
} }
#endif #endif
printk("%s\n", print_mac(mac, dev->dev_addr)); printk("%pM\n", dev->dev_addr);
ei_status.name = name; ei_status.name = name;
ei_status.tx_start_page = start_page; ei_status.tx_start_page = start_page;
drivers/net/ne2.c
+2 -4
View File
@@ -302,7 +302,6 @@ out:
static int ne2_procinfo(char *buf, int slot, struct net_device *dev) static int ne2_procinfo(char *buf, int slot, struct net_device *dev)
{ {
int len=0; int len=0;
DECLARE_MAC_BUF(mac);
len += sprintf(buf+len, "The NE/2 Ethernet Adapter\n" ); len += sprintf(buf+len, "The NE/2 Ethernet Adapter\n" );
len += sprintf(buf+len, "Driver written by Wim Dumon "); len += sprintf(buf+len, "Driver written by Wim Dumon ");
@@ -313,7 +312,7 @@ static int ne2_procinfo(char *buf, int slot, struct net_device *dev)
len += sprintf(buf+len, "Based on the original NE2000 drivers\n" ); len += sprintf(buf+len, "Based on the original NE2000 drivers\n" );
len += sprintf(buf+len, "Base IO: %#x\n", (unsigned int)dev->base_addr); len += sprintf(buf+len, "Base IO: %#x\n", (unsigned int)dev->base_addr);
len += sprintf(buf+len, "IRQ : %d\n", dev->irq); len += sprintf(buf+len, "IRQ : %d\n", dev->irq);
len += sprintf(buf+len, "HW addr : %s\n", print_mac(mac, dev->dev_addr)); len += sprintf(buf+len, "HW addr : %pM\n", dev->dev_addr);
return len; return len;
} }
@@ -326,7 +325,6 @@ static int __init ne2_probe1(struct net_device *dev, int slot)
const char *name = "NE/2"; const char *name = "NE/2";
int start_page, stop_page; int start_page, stop_page;
static unsigned version_printed; static unsigned version_printed;
DECLARE_MAC_BUF(mac);
if (ei_debug && version_printed++ == 0) if (ei_debug && version_printed++ == 0)
printk(version); printk(version);
@@ -469,7 +467,7 @@ static int __init ne2_probe1(struct net_device *dev, int slot)
for(i = 0; i < ETHER_ADDR_LEN; i++) for(i = 0; i < ETHER_ADDR_LEN; i++)
dev->dev_addr[i] = SA_prom[i]; dev->dev_addr[i] = SA_prom[i];
printk(" %s\n", print_mac(mac, dev->dev_addr)); printk(" %pM\n", dev->dev_addr);
printk("%s: %s found at %#x, using IRQ %d.\n", printk("%s: %s found at %#x, using IRQ %d.\n",
dev->name, name, base_addr, dev->irq); dev->name, name, base_addr, dev->irq);
drivers/net/ne2k-pci.c
+2 -3
View File
@@ -212,7 +212,6 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
static unsigned int fnd_cnt; static unsigned int fnd_cnt;
long ioaddr; long ioaddr;
int flags = pci_clone_list[chip_idx].flags; int flags = pci_clone_list[chip_idx].flags;
DECLARE_MAC_BUF(mac);
/* when built into the kernel, we only print version if device is found */ /* when built into the kernel, we only print version if device is found */
#ifndef MODULE #ifndef MODULE
@@ -368,9 +367,9 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
for(i = 0; i < 6; i++) for(i = 0; i < 6; i++)
dev->dev_addr[i] = SA_prom[i]; dev->dev_addr[i] = SA_prom[i];
printk("%s: %s found at %#lx, IRQ %d, %s.\n", printk("%s: %s found at %#lx, IRQ %d, %pM.\n",
dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq, dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq,
print_mac(mac, dev->dev_addr)); dev->dev_addr);
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
drivers/net/ne3210.c
+2 -3
View File
@@ -99,7 +99,6 @@ static int __init ne3210_eisa_probe (struct device *device)
int i, retval, port_index; int i, retval, port_index;
struct eisa_device *edev = to_eisa_device (device); struct eisa_device *edev = to_eisa_device (device);
struct net_device *dev; struct net_device *dev;
DECLARE_MAC_BUF(mac);
/* Allocate dev->priv and fill in 8390 specific dev fields. */ /* Allocate dev->priv and fill in 8390 specific dev fields. */
if (!(dev = alloc_ei_netdev ())) { if (!(dev = alloc_ei_netdev ())) {
@@ -131,8 +130,8 @@ static int __init ne3210_eisa_probe (struct device *device)
port_index = inb(ioaddr + NE3210_CFG2) >> 6; port_index = inb(ioaddr + NE3210_CFG2) >> 6;
for(i = 0; i < ETHER_ADDR_LEN; i++) for(i = 0; i < ETHER_ADDR_LEN; i++)
dev->dev_addr[i] = inb(ioaddr + NE3210_SA_PROM + i); dev->dev_addr[i] = inb(ioaddr + NE3210_SA_PROM + i);
printk("ne3210.c: NE3210 in EISA slot %d, media: %s, addr: %s.\n", printk("ne3210.c: NE3210 in EISA slot %d, media: %s, addr: %pM.\n",
edev->slot, ifmap[port_index], print_mac(mac, dev->dev_addr)); edev->slot, ifmap[port_index], dev->dev_addr);
/* Snarf the interrupt now. CFG file has them all listed as `edge' with share=NO */ /* Snarf the interrupt now. CFG file has them all listed as `edge' with share=NO */
dev->irq = irq_map[(inb(ioaddr + NE3210_CFG2) >> 3) & 0x07]; dev->irq = irq_map[(inb(ioaddr + NE3210_CFG2) >> 3) & 0x07];
drivers/net/netconsole.c
+3 -6
View File
@@ -307,17 +307,14 @@ static ssize_t show_remote_ip(struct netconsole_target *nt, char *buf)
static ssize_t show_local_mac(struct netconsole_target *nt, char *buf) static ssize_t show_local_mac(struct netconsole_target *nt, char *buf)
{ {
struct net_device *dev = nt->np.dev; struct net_device *dev = nt->np.dev;
static const u8 bcast[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
DECLARE_MAC_BUF(mac); return snprintf(buf, PAGE_SIZE, "%pM\n", dev ? dev->dev_addr : bcast);
return snprintf(buf, PAGE_SIZE, "%s\n", dev ?
print_mac(mac, dev->dev_addr) : "ff:ff:ff:ff:ff:ff");
} }
static ssize_t show_remote_mac(struct netconsole_target *nt, char *buf) static ssize_t show_remote_mac(struct netconsole_target *nt, char *buf)
{ {
DECLARE_MAC_BUF(mac); return snprintf(buf, PAGE_SIZE, "%pM\n", nt->np.remote_mac);
return snprintf(buf, PAGE_SIZE, "%s\n",
print_mac(mac, nt->np.remote_mac));
} }
/* /*
drivers/net/netxen/netxen_nic_main.c
+3 -5
View File
@@ -439,7 +439,6 @@ netxen_read_mac_addr(struct netxen_adapter *adapter)
int i; int i;
unsigned char *p; unsigned char *p;
__le64 mac_addr; __le64 mac_addr;
DECLARE_MAC_BUF(mac);
struct net_device *netdev = adapter->netdev; struct net_device *netdev = adapter->netdev;
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = adapter->pdev;
@@ -462,10 +461,9 @@ netxen_read_mac_addr(struct netxen_adapter *adapter)
/* set station address */ /* set station address */
if (!is_valid_ether_addr(netdev->perm_addr)) { if (!is_valid_ether_addr(netdev->perm_addr))
dev_warn(&pdev->dev, "Bad MAC address %s.\n", dev_warn(&pdev->dev, "Bad MAC address %pM.\n", netdev->dev_addr);
print_mac(mac, netdev->dev_addr)); else
} else
adapter->macaddr_set(adapter, netdev->dev_addr); adapter->macaddr_set(adapter, netdev->dev_addr);
return 0; return 0;
drivers/net/netxen/netxen_nic_niu.c
+2 -5
View File
@@ -608,7 +608,6 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter,
int phy = adapter->physical_port; int phy = adapter->physical_port;
unsigned char mac_addr[6]; unsigned char mac_addr[6];
int i; int i;
DECLARE_MAC_BUF(mac);
if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
return 0; return 0;
@@ -636,10 +635,8 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter,
if (i == 10) { if (i == 10) {
printk(KERN_ERR "%s: cannot set Mac addr for %s\n", printk(KERN_ERR "%s: cannot set Mac addr for %s\n",
netxen_nic_driver_name, adapter->netdev->name); netxen_nic_driver_name, adapter->netdev->name);
printk(KERN_ERR "MAC address set: %s.\n", printk(KERN_ERR "MAC address set: %pM.\n", addr);
print_mac(mac, addr)); printk(KERN_ERR "MAC address get: %pM.\n", mac_addr);
printk(KERN_ERR "MAC address get: %s.\n",
print_mac(mac, mac_addr));
} }
return 0; return 0;
} }
drivers/net/ni5010.c
+1 -2
View File
@@ -203,7 +203,6 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
unsigned int data = 0; unsigned int data = 0;
int boguscount = 40; int boguscount = 40;
int err = -ENODEV; int err = -ENODEV;
DECLARE_MAC_BUF(mac);
dev->base_addr = ioaddr; dev->base_addr = ioaddr;
dev->irq = irq; dev->irq = irq;
@@ -271,7 +270,7 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
outw(i, IE_GP); outw(i, IE_GP);
dev->dev_addr[i] = inb(IE_SAPROM); dev->dev_addr[i] = inb(IE_SAPROM);
} }
printk("%s ", print_mac(mac, dev->dev_addr)); printk("%pM ", dev->dev_addr);
PRINTK2((KERN_DEBUG "%s: I/O #4 passed!\n", dev->name)); PRINTK2((KERN_DEBUG "%s: I/O #4 passed!\n", dev->name));
drivers/net/niu.c
+1 -3
View File
@@ -8638,10 +8638,8 @@ static void __devinit niu_assign_netdev_ops(struct net_device *dev)
static void __devinit niu_device_announce(struct niu *np) static void __devinit niu_device_announce(struct niu *np)
{ {
struct net_device *dev = np->dev; struct net_device *dev = np->dev;
DECLARE_MAC_BUF(mac);
pr_info("%s: NIU Ethernet %s\n", pr_info("%s: NIU Ethernet %pM\n", dev->name, dev->dev_addr);
dev->name, print_mac(mac, dev->dev_addr));
if (np->parent->plat_type == PLAT_TYPE_ATCA_CP3220) { if (np->parent->plat_type == PLAT_TYPE_ATCA_CP3220) {
pr_info("%s: Port type[%s] mode[%s:%s] XCVR[%s] phy[%s]\n", pr_info("%s: Port type[%s] mode[%s:%s] XCVR[%s] phy[%s]\n",
drivers/net/ns83820.c
+2 -4
View File
@@ -1955,7 +1955,6 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
long addr; long addr;
int err; int err;
int using_dac = 0; int using_dac = 0;
DECLARE_MAC_BUF(mac);
/* See if we can set the dma mask early on; failure is fatal. */ /* See if we can set the dma mask early on; failure is fatal. */
if (sizeof(dma_addr_t) == 8 && if (sizeof(dma_addr_t) == 8 &&
@@ -2220,12 +2219,11 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
ndev->features |= NETIF_F_HIGHDMA; ndev->features |= NETIF_F_HIGHDMA;
} }
printk(KERN_INFO "%s: ns83820 v" VERSION ": DP83820 v%u.%u: %s io=0x%08lx irq=%d f=%s\n", printk(KERN_INFO "%s: ns83820 v" VERSION ": DP83820 v%u.%u: %pM io=0x%08lx irq=%d f=%s\n",
ndev->name, ndev->name,
(unsigned)readl(dev->base + SRR) >> 8, (unsigned)readl(dev->base + SRR) >> 8,
(unsigned)readl(dev->base + SRR) & 0xff, (unsigned)readl(dev->base + SRR) & 0xff,
print_mac(mac, ndev->dev_addr), ndev->dev_addr, addr, pci_dev->irq,
addr, pci_dev->irq,
(ndev->features & NETIF_F_HIGHDMA) ? "h,sg" : "sg" (ndev->features & NETIF_F_HIGHDMA) ? "h,sg" : "sg"
); );
drivers/net/pasemi_mac.c
+2 -3
View File
@@ -1742,7 +1742,6 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct net_device *dev; struct net_device *dev;
struct pasemi_mac *mac; struct pasemi_mac *mac;
int err; int err;
DECLARE_MAC_BUF(mac_buf);
err = pci_enable_device(pdev); err = pci_enable_device(pdev);
if (err) if (err)
@@ -1849,9 +1848,9 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err); err);
goto out; goto out;
} else if netif_msg_probe(mac) } else if netif_msg_probe(mac)
printk(KERN_INFO "%s: PA Semi %s: intf %d, hw addr %s\n", printk(KERN_INFO "%s: PA Semi %s: intf %d, hw addr %pM\n",
dev->name, mac->type == MAC_TYPE_GMAC ? "GMAC" : "XAUI", dev->name, mac->type == MAC_TYPE_GMAC ? "GMAC" : "XAUI",
mac->dma_if, print_mac(mac_buf, dev->dev_addr)); mac->dma_if, dev->dev_addr);
return err; return err;
drivers/net/pci-skeleton.c
+2 -3
View File
@@ -737,7 +737,6 @@ static int __devinit netdrv_init_one (struct pci_dev *pdev,
int i, addr_len, option; int i, addr_len, option;
void *ioaddr = NULL; void *ioaddr = NULL;
static int board_idx = -1; static int board_idx = -1;
DECLARE_MAC_BUF(mac);
/* when built into the kernel, we only print version if device is found */ /* when built into the kernel, we only print version if device is found */
#ifndef MODULE #ifndef MODULE
@@ -797,11 +796,11 @@ static int __devinit netdrv_init_one (struct pci_dev *pdev,
tp->phys[0] = 32; tp->phys[0] = 32;
printk (KERN_INFO "%s: %s at 0x%lx, %sIRQ %d\n", printk (KERN_INFO "%s: %s at 0x%lx, %pM IRQ %d\n",
dev->name, dev->name,
board_info[ent->driver_data].name, board_info[ent->driver_data].name,
dev->base_addr, dev->base_addr,
print_mac(mac, dev->dev_addr), dev->dev_addr,
dev->irq); dev->irq);
printk (KERN_DEBUG "%s: Identified 8139 chip type '%s'\n", printk (KERN_DEBUG "%s: Identified 8139 chip type '%s'\n",
drivers/net/pcmcia/3c574_cs.c
+2 -3
View File
@@ -345,7 +345,6 @@ static int tc574_config(struct pcmcia_device *link)
__be16 *phys_addr; __be16 *phys_addr;
char *cardname; char *cardname;
__u32 config; __u32 config;
DECLARE_MAC_BUF(mac);
phys_addr = (__be16 *)dev->dev_addr; phys_addr = (__be16 *)dev->dev_addr;
@@ -463,9 +462,9 @@ static int tc574_config(struct pcmcia_device *link)
strcpy(lp->node.dev_name, dev->name); strcpy(lp->node.dev_name, dev->name);
printk(KERN_INFO "%s: %s at io %#3lx, irq %d, " printk(KERN_INFO "%s: %s at io %#3lx, irq %d, "
"hw_addr %s.\n", "hw_addr %pM.\n",
dev->name, cardname, dev->base_addr, dev->irq, dev->name, cardname, dev->base_addr, dev->irq,
print_mac(mac, dev->dev_addr)); dev->dev_addr);
printk(" %dK FIFO split %s Rx:Tx, %sMII interface.\n", printk(" %dK FIFO split %s Rx:Tx, %sMII interface.\n",
8 << config & Ram_size, 8 << config & Ram_size,
ram_split[(config & Ram_split) >> Ram_split_shift], ram_split[(config & Ram_split) >> Ram_split_shift],
drivers/net/pcmcia/3c589_cs.c
+2 -3
View File
@@ -255,7 +255,6 @@ static int tc589_config(struct pcmcia_device *link)
int last_fn, last_ret, i, j, multi = 0, fifo; int last_fn, last_ret, i, j, multi = 0, fifo;
unsigned int ioaddr; unsigned int ioaddr;
char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"}; char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
DECLARE_MAC_BUF(mac);
DEBUG(0, "3c589_config(0x%p)\n", link); DEBUG(0, "3c589_config(0x%p)\n", link);
@@ -333,9 +332,9 @@ static int tc589_config(struct pcmcia_device *link)
strcpy(lp->node.dev_name, dev->name); strcpy(lp->node.dev_name, dev->name);
printk(KERN_INFO "%s: 3Com 3c%s, io %#3lx, irq %d, " printk(KERN_INFO "%s: 3Com 3c%s, io %#3lx, irq %d, "
"hw_addr %s\n", "hw_addr %pM\n",
dev->name, (multi ? "562" : "589"), dev->base_addr, dev->irq, dev->name, (multi ? "562" : "589"), dev->base_addr, dev->irq,
print_mac(mac, dev->dev_addr)); dev->dev_addr);
printk(KERN_INFO " %dK FIFO split %s Rx:Tx, %s xcvr\n", printk(KERN_INFO " %dK FIFO split %s Rx:Tx, %s xcvr\n",
(fifo & 7) ? 32 : 8, ram_split[(fifo >> 16) & 3], (fifo & 7) ? 32 : 8, ram_split[(fifo >> 16) & 3],
if_names[dev->if_port]); if_names[dev->if_port]);

Some files were not shown because too many files have changed in this diff Show More