Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6

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

diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index ee132b1e09b08b0df17c2c86a7a1c13b69e1d9e0..451acdca2a214a97068b46f597930b25d2e05f87 100644 (file)
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -101,6 +101,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
        struct mace_data *mp;
        const unsigned char *addr;
        int j, rev, rc = -EBUSY;
+       DECLARE_MAC_BUF(mac);
 
        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",
@@ -240,11 +241,9 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
                goto err_free_rx_irq;
        }
 
-       printk(KERN_INFO "%s: MACE at", dev->name);
-       for (j = 0; j < 6; ++j) {
-               printk("%c%.2x", (j? ':': ' '), dev->dev_addr[j]);
-       }
-       printk(", chip revision %d.%d\n", mp->chipid >> 8, mp->chipid & 0xff);
+       printk(KERN_INFO "%s: MACE at %s, chip revision %d.%d\n",
+              dev->name, print_mac(mac, dev->dev_addr),
+              mp->chipid >> 8, mp->chipid & 0xff);
 
        return 0;
 
@@ -410,7 +409,7 @@ static inline void mace_clean_rings(struct mace_data *mp)
 
     /* free some skb's */
     for (i = 0; i < N_RX_RING; ++i) {
-       if (mp->rx_bufs[i] != 0) {
+       if (mp->rx_bufs[i] != NULL) {
            dev_kfree_skb(mp->rx_bufs[i]);
            mp->rx_bufs[i] = NULL;
        }
@@ -442,7 +441,7 @@ static int mace_open(struct net_device *dev)
     cp = mp->rx_cmds;
     for (i = 0; i < N_RX_RING - 1; ++i) {
        skb = dev_alloc_skb(RX_BUFLEN + 2);
-       if (skb == 0) {
+       if (!skb) {
            data = dummy_buf;
        } else {
            skb_reserve(skb, 2);        /* so IP header lands on 4-byte bdry */
@@ -904,7 +903,7 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id)
        out_le16(&cp->command, DBDMA_STOP);
        /* got a packet, have a look at it */
        skb = mp->rx_bufs[i];
-       if (skb == 0) {
+       if (!skb) {
            ++dev->stats.rx_dropped;
        } else if (nb > 8) {
            data = skb->data;
@@ -954,9 +953,9 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id)
            break;
        cp = mp->rx_cmds + i;
        skb = mp->rx_bufs[i];
-       if (skb == 0) {
+       if (!skb) {
            skb = dev_alloc_skb(RX_BUFLEN + 2);
-           if (skb != 0) {
+           if (skb) {
                skb_reserve(skb, 2);
                mp->rx_bufs[i] = skb;
            }