lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Wrap up acceess to ASICCtrl high word with a macro

Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis Kirjanov
2010-12-21 02:01:36 +00:00
committed by David S. Miller
parent 12b16dadbc
commit 24de5285dc
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/sundance.c
View File

@@ -294,6 +294,9 @@ enum alta_offsets {
/* Aliased and bogus values! */ /* Aliased and bogus values! */
RxStatus = 0x0c, RxStatus = 0x0c,
}; };
#define ASIC_HI_WORD(x) ((x) + 2)
enum ASICCtrl_HiWord_bit { enum ASICCtrl_HiWord_bit {
GlobalReset = 0x0001, GlobalReset = 0x0001,
RxReset = 0x0002, RxReset = 0x0002,
@@ -1772,10 +1775,10 @@ static int netdev_close(struct net_device *dev)
} }
iowrite16(GlobalReset | DMAReset | FIFOReset | NetworkReset, iowrite16(GlobalReset | DMAReset | FIFOReset | NetworkReset,
ioaddr +ASICCtrl + 2); ioaddr + ASIC_HI_WORD(ASICCtrl));
for (i = 2000; i > 0; i--) { for (i = 2000; i > 0; i--) {
if ((ioread16(ioaddr + ASICCtrl +2) & ResetBusy) == 0) if ((ioread16(ioaddr + ASIC_HI_WORD(ASICCtrl)) & ResetBusy) == 0)
break; break;
mdelay(1); mdelay(1);
} }