git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
arm
/
am79c961a.c
diff --git
a/drivers/net/arm/am79c961a.c
b/drivers/net/arm/am79c961a.c
index
2143eeb
..
a637910
100644
(file)
--- a/
drivers/net/arm/am79c961a.c
+++ b/
drivers/net/arm/am79c961a.c
@@
-414,7
+414,7
@@
static void am79c961_setmulticastlist (struct net_device *dev)
/*
* Update the multicast hash table
*/
/*
* Update the multicast hash table
*/
- for (i = 0; i <
sizeof(multi_hash) / sizeof(multi_hash[0]
); i++)
+ for (i = 0; i <
ARRAY_SIZE(multi_hash
); i++)
write_rreg(dev->base_addr, i + LADRL, multi_hash[i]);
/*
write_rreg(dev->base_addr, i + LADRL, multi_hash[i]);
/*
@@
-693,11
+693,15
@@
static int __init am79c961_probe(struct platform_device *pdev)
* done by the ether bootp loader.
*/
dev->base_addr = res->start;
* done by the ether bootp loader.
*/
dev->base_addr = res->start;
-
dev->irq
= platform_get_irq(pdev, 0);
+
ret
= platform_get_irq(pdev, 0);
- ret = -ENODEV;
- if (dev->irq < 0)
+ if (ret < 0) {
+ ret = -ENODEV;
goto nodev;
goto nodev;
+ }
+ dev->irq = ret;
+
+ ret = -ENODEV;
if (!request_region(dev->base_addr, 0x18, dev->name))
goto nodev;
if (!request_region(dev->base_addr, 0x18, dev->name))
goto nodev;
@@
-741,12
+745,10
@@
static int __init am79c961_probe(struct platform_device *pdev)
ret = register_netdev(dev);
if (ret == 0) {
ret = register_netdev(dev);
if (ret == 0) {
- printk(KERN_INFO "%s: ether address ", dev->name);
-
- /* Retrive and print the ethernet address. */
- for (i = 0; i < 6; i++)
- printk (i == 5 ? "%02x\n" : "%02x:", dev->dev_addr[i]);
+ DECLARE_MAC_BUF(mac);
+ printk(KERN_INFO "%s: ether address %s\n",
+ dev->name, print_mac(mac, dev->dev_addr));
return 0;
}
return 0;
}