mv643xx_eth: calculate descriptor pointer only once in rxq_refill()

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

diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index 4207d6efddc097c5b62df3db15d726e102f612e1..337488ec707cfc2aad6b14ae7aec63315510529c 100644 (file)
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -758,13 +758,10 @@ static int ax_init_dev(struct net_device *dev, int first_init)
 #endif
        ax_NS8390_init(dev, 0);
 
-       if (first_init) {
-               DECLARE_MAC_BUF(mac);
-
-               dev_info(&ax->dev->dev, "%dbit, irq %d, %lx, MAC: %s\n",
+       if (first_init)
+               dev_info(&ax->dev->dev, "%dbit, irq %d, %lx, MAC: %pM\n",
                         ei_status.word16 ? 16:8, dev->irq, dev->base_addr,
-                        print_mac(mac, dev->dev_addr));
-       }
+                        dev->dev_addr);
 
        ret = register_netdev(dev);
        if (ret)
@@ -838,12 +835,12 @@ static int ax_probe(struct platform_device *pdev)
 
        /* find the platform resources */
 
-       dev->irq  = platform_get_irq(pdev, 0);
-       if (dev->irq < 0) {
+       ret  = platform_get_irq(pdev, 0);
+       if (ret < 0) {
                dev_err(&pdev->dev, "no IRQ specified\n");
-               ret = -ENXIO;
                goto exit_mem;
        }
+       dev->irq = ret;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (res == NULL) {