Skip to contentSkip to conversation

sundance: Wrap up acceess to ASICCtrl high word with a macro

PATCH Applied Denis Kirjanov 2 participants 2 messages Dec 21, 2010

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Denis Kirjanov

author
#0 lore raw

PATCH 1/2 sundance: Wrap up acceess to ASICCtrl high word with a macro

Wrap up acceess to ASICCtrl high word with a macro

Signed-off-by Denis Kirjanov <[email protected]>
---
 drivers/net/sundance.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/net/sundance.c +5 -2
index 3ed2a67..d82944c 100644
@@ -294,6 +294,9 @@ enum alta_offsets {
 	/* Aliased and bogus values! */
 	RxStatus = 0x0c,
 };
+
+#define ASIC_HI_WORD(x)	((x) + 2)
+
 enum ASICCtrl_HiWord_bit {
 	GlobalReset = 0x0001,
 	RxReset = 0x0002,

@@ -1772,10 +1775,10 @@ static int netdev_close(struct net_device *dev)
     	}
 
     	iowrite16(GlobalReset | DMAReset | FIFOReset | NetworkReset,
-			ioaddr +ASICCtrl + 2);
+			ioaddr + ASIC_HI_WORD(ASICCtrl));
 
     	for (i = 2000; i > 0; i--) {
- 		if ((ioread16(ioaddr + ASICCtrl +2) & ResetBusy) == 0)
+ 		if ((ioread16(ioaddr + ASIC_HI_WORD(ASICCtrl)) & ResetBusy) == 0)
 			break;
 		mdelay(1);
     	}
Signature · 1 line
1.7.2.2