From 24de5285dce378e4170e068f2662236d2b46c033 Mon Sep 17 00:00:00 2001 From: Denis Kirjanov Date: Tue, 21 Dec 2010 02:01:36 +0000 Subject: [PATCH] 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 Signed-off-by: David S. Miller --- drivers/net/sundance.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index 3ed2a67bd6d3..8916f29301d6 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c @@ -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); } -- 2.39.5