Merge git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6-omap-h63xx.git] / drivers / net / arm / am79c961a.c

diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index 09d5c3f26985a804e34b49e9ef6c6b0c84677b51..ba6bd03a015ff6afad60ae65d8c614b35a6671d4 100644 (file)
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -38,7 +38,7 @@
 #include "am79c961a.h"
 
 static irqreturn_t
-am79c961_interrupt (int irq, void *dev_id, struct pt_regs *regs);
+am79c961_interrupt (int irq, void *dev_id);
 
 static unsigned int net_debug = NET_DEBUG;
 
@@ -414,7 +414,7 @@ static void am79c961_setmulticastlist (struct net_device *dev)
        /*
         * 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]);
 
        /*
@@ -526,7 +526,6 @@ am79c961_rx(struct net_device *dev, struct dev_priv *priv)
                skb = dev_alloc_skb(len + 2);
 
                if (skb) {
-                       skb->dev = dev;
                        skb_reserve(skb, 2);
 
                        am_readbuffer(dev, pktaddr, skb_put(skb, len), len);
@@ -596,7 +595,7 @@ am79c961_tx(struct net_device *dev, struct dev_priv *priv)
 }
 
 static irqreturn_t
-am79c961_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+am79c961_interrupt(int irq, void *dev_id)
 {
        struct net_device *dev = (struct net_device *)dev_id;
        struct dev_priv *priv = netdev_priv(dev);
@@ -635,7 +634,7 @@ static void am79c961_poll_controller(struct net_device *dev)
 {
        unsigned long flags;
        local_irq_save(flags);
-       am79c961_interrupt(dev->irq, dev, NULL);
+       am79c961_interrupt(dev->irq, dev);
        local_irq_restore(flags);
 }
 #endif
@@ -742,12 +741,10 @@ static int __init am79c961_probe(struct platform_device *pdev)
 
        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;
        }