| Message ID | 20101221120136.GA16612@hera.kernel.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Denis Kirjanov <dkirjanov@kernel.org> Date: Tue, 21 Dec 2010 12:01:36 +0000 > Wrap up acceess to ASICCtrl high word with a macro > > Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index 3ed2a67..d82944c 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); }
Wrap up acceess to ASICCtrl high word with a macro Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org> --- drivers/net/sundance.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)