From a3323d21493dc002d6a6dc75c749aaca3489b28d Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Mon, 15 Oct 2007 19:34:34 +1000
Subject: [PATCH] --- yaml --- r: 69327 b: refs/heads/master c:
 792036952123a0670c7dd6960ca5458cdfd5e4fd h: refs/heads/master i:   69325:
 2b87cea08d4f18b5f1b8a46eb3d234a7eac84358   69323:
 90edb1bd2ec241af10a82a3c5de7234d9fb15894   69319:
 cc4b3c62386ea293c4694b60dff5dcdf30836a97   69311:
 d999e624a688fee87731dbe3cf14b08e79d0f5f4 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/ibm_newemac/mal.c | 9 +++++----
 trunk/drivers/net/ibm_newemac/mal.h | 5 ++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index ef7dfdb42d88..31fcff48cd5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc2618f7528d4b6ea0c2c53539a3b8cff2b33b24
+refs/heads/master: 792036952123a0670c7dd6960ca5458cdfd5e4fd
diff --git a/trunk/drivers/net/ibm_newemac/mal.c b/trunk/drivers/net/ibm_newemac/mal.c
index 58854117b1a9..748a86969d73 100644
--- a/trunk/drivers/net/ibm_newemac/mal.c
+++ b/trunk/drivers/net/ibm_newemac/mal.c
@@ -461,6 +461,7 @@ static int __devinit mal_probe(struct of_device *ofdev,
 	struct mal_instance *mal;
 	int err = 0, i, bd_size;
 	int index = mal_count++;
+	unsigned int dcr_base;
 	const u32 *prop;
 	u32 cfg;
 
@@ -497,14 +498,14 @@ static int __devinit mal_probe(struct of_device *ofdev,
 	}
 	mal->num_rx_chans = prop[0];
 
-	mal->dcr_base = dcr_resource_start(ofdev->node, 0);
-	if (mal->dcr_base == 0) {
+	dcr_base = dcr_resource_start(ofdev->node, 0);
+	if (dcr_base == 0) {
 		printk(KERN_ERR
 		       "mal%d: can't find DCR resource!\n", index);
 		err = -ENODEV;
 		goto fail;
 	}
-        mal->dcr_host = dcr_map(ofdev->node, mal->dcr_base, 0x100);
+	mal->dcr_host = dcr_map(ofdev->node, dcr_base, 0x100);
 	if (!DCR_MAP_OK(mal->dcr_host)) {
 		printk(KERN_ERR
 		       "mal%d: failed to map DCRs !\n", index);
@@ -626,7 +627,7 @@ static int __devinit mal_probe(struct of_device *ofdev,
  fail2:
 	dma_free_coherent(&ofdev->dev, bd_size, mal->bd_virt, mal->bd_dma);
  fail_unmap:
-	dcr_unmap(mal->dcr_host, mal->dcr_base, 0x100);
+	dcr_unmap(mal->dcr_host, dcr_base, 0x100);
  fail:
 	kfree(mal);
 
diff --git a/trunk/drivers/net/ibm_newemac/mal.h b/trunk/drivers/net/ibm_newemac/mal.h
index cb1a16d589fe..6daa98e5992e 100644
--- a/trunk/drivers/net/ibm_newemac/mal.h
+++ b/trunk/drivers/net/ibm_newemac/mal.h
@@ -185,7 +185,6 @@ struct mal_commac {
 
 struct mal_instance {
 	int			version;
-	int			dcr_base;
 	dcr_host_t		dcr_host;
 
 	int			num_tx_chans;	/* Number of TX channels */
@@ -213,12 +212,12 @@ struct mal_instance {
 
 static inline u32 get_mal_dcrn(struct mal_instance *mal, int reg)
 {
-	return dcr_read(mal->dcr_host, mal->dcr_base + reg);
+	return dcr_read(mal->dcr_host, mal->dcr_host.base + reg);
 }
 
 static inline void set_mal_dcrn(struct mal_instance *mal, int reg, u32 val)
 {
-	dcr_write(mal->dcr_host, mal->dcr_base + reg, val);
+	dcr_write(mal->dcr_host, mal->dcr_host.base + reg, val);
 }
 
 /* Register MAL devices */