Skip to content

Commit

Permalink
sundance: Wrap up acceess to ASICCtrl high word with a macro
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Denis Kirjanov authored and David S. Miller committed Dec 21, 2010
1 parent 12b16da commit 24de528
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/net/sundance.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 24de528

Please sign in to comment.