diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 18:59:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:06:18 -0400 |
commit | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch) | |
tree | e8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/ns83820.c | |
parent | 0c68ae2605dbcf67414d8d1f19af93be44b355fb (diff) |
net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were
a few things that had conflicts which I have just dropped for
now, no harm done.
I've built an allyesconfig with this and looked at the files
that weren't built very carefully, but it's a huge patch.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ns83820.c')
-rw-r--r-- | drivers/net/ns83820.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index ff449619f047..4bb64415437f 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c | |||
@@ -1955,7 +1955,6 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_ | |||
1955 | long addr; | 1955 | long addr; |
1956 | int err; | 1956 | int err; |
1957 | int using_dac = 0; | 1957 | int using_dac = 0; |
1958 | DECLARE_MAC_BUF(mac); | ||
1959 | 1958 | ||
1960 | /* See if we can set the dma mask early on; failure is fatal. */ | 1959 | /* See if we can set the dma mask early on; failure is fatal. */ |
1961 | if (sizeof(dma_addr_t) == 8 && | 1960 | if (sizeof(dma_addr_t) == 8 && |
@@ -2220,12 +2219,11 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_ | |||
2220 | ndev->features |= NETIF_F_HIGHDMA; | 2219 | ndev->features |= NETIF_F_HIGHDMA; |
2221 | } | 2220 | } |
2222 | 2221 | ||
2223 | printk(KERN_INFO "%s: ns83820 v" VERSION ": DP83820 v%u.%u: %s io=0x%08lx irq=%d f=%s\n", | 2222 | printk(KERN_INFO "%s: ns83820 v" VERSION ": DP83820 v%u.%u: %pM io=0x%08lx irq=%d f=%s\n", |
2224 | ndev->name, | 2223 | ndev->name, |
2225 | (unsigned)readl(dev->base + SRR) >> 8, | 2224 | (unsigned)readl(dev->base + SRR) >> 8, |
2226 | (unsigned)readl(dev->base + SRR) & 0xff, | 2225 | (unsigned)readl(dev->base + SRR) & 0xff, |
2227 | print_mac(mac, ndev->dev_addr), | 2226 | ndev->dev_addr, addr, pci_dev->irq, |
2228 | addr, pci_dev->irq, | ||
2229 | (ndev->features & NETIF_F_HIGHDMA) ? "h,sg" : "sg" | 2227 | (ndev->features & NETIF_F_HIGHDMA) ? "h,sg" : "sg" |
2230 | ); | 2228 | ); |
2231 | 2229 | ||