From 5dad0b3c9c509747a8baa11dc8afde4e44cc335c Mon Sep 17 00:00:00 2001
From: Finn Thain <fthain@telegraphics.com.au>
Date: Mon, 25 May 2009 16:52:47 +0000
Subject: [PATCH] --- yaml --- r: 150574 b: refs/heads/master c:
 cd39c7a5717191c677a140565bda2f1ca485ecd8 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/net/mac8390.c | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index d3e358d02dba..defea98e775a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccffad25b5136958d4769ed6de5e87992dd9c65c
+refs/heads/master: cd39c7a5717191c677a140565bda2f1ca485ecd8
diff --git a/trunk/drivers/net/mac8390.c b/trunk/drivers/net/mac8390.c
index 8e884869a05b..0585df1e2c1b 100644
--- a/trunk/drivers/net/mac8390.c
+++ b/trunk/drivers/net/mac8390.c
@@ -620,19 +620,12 @@ static int __init mac8390_initdev(struct net_device * dev, struct nubus_dev * nd
 
 	/* Good, done, now spit out some messages */
 	printk(KERN_INFO "%s: %s in slot %X (type %s)\n",
-		   dev->name, ndev->board->name, ndev->board->slot, cardname[type]);
-	printk(KERN_INFO "MAC ");
-	{
-		int i;
-		for (i = 0; i < 6; i++) {
-			printk("%2.2x", dev->dev_addr[i]);
-			if (i < 5)
-				printk(":");
-		}
-	}
-	printk(" IRQ %d, %d KB shared memory at %#lx,  %d-bit access.\n",
-		   dev->irq, (int)((dev->mem_end - dev->mem_start)/0x1000) * 4,
-		   dev->mem_start, access_bitmode?32:16);
+	       dev->name, ndev->board->name, ndev->board->slot, cardname[type]);
+	printk(KERN_INFO
+	       "MAC %pM IRQ %d, %d KB shared memory at %#lx, %d-bit access.\n",
+	       dev->dev_addr, dev->irq,
+	       (unsigned int)(dev->mem_end - dev->mem_start) >> 10,
+	       dev->mem_start, access_bitmode ? 32 : 16);
 	return 0;
 }