* [PATCH 1/2 -next] sundance: Wrap up acceess to ASICCtrl high word with a macro
@ 2010-12-21 12:01 Denis Kirjanov
2010-12-21 21:25 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Denis Kirjanov @ 2010-12-21 12:01 UTC (permalink / raw)
To: davem; +Cc: netdev
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(-)
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);
}
--
1.7.2.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2 -next] sundance: Wrap up acceess to ASICCtrl high word with a macro
2010-12-21 12:01 [PATCH 1/2 -next] sundance: Wrap up acceess to ASICCtrl high word with a macro Denis Kirjanov
@ 2010-12-21 21:25 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-12-21 21:25 UTC (permalink / raw)
To: dkirjanov; +Cc: netdev
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-12-21 21:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-21 12:01 [PATCH 1/2 -next] sundance: Wrap up acceess to ASICCtrl high word with a macro Denis Kirjanov
2010-12-21 21:25 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).