diff options
author | David S. Miller <davem@davemloft.net> | 2010-07-07 21:23:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-07 21:23:19 -0400 |
commit | 5cf3e03457aa905f17f9765702850316b69aad1e (patch) | |
tree | 9edbaabc470bbd88315ef1abc65fe74a3e482974 /drivers/net/ethoc.c | |
parent | a038716957d3888a595014a660b1db1f28946f62 (diff) |
ethoc: Fix warning in ethoc_init_ring().
Get rid of the pointless back-and-forth casting of dev->mem_start
from long to pointer back to long again.
Also fixes a warning reported by Stephen Rothwell:
drivers/net/ethoc.c: In function 'ethoc_init_ring':
drivers/net/ethoc.c:302: warning: assignment makes integer from pointer without a cast
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethoc.c')
-rw-r--r-- | drivers/net/ethoc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index db519a81e53a..5bb6bb74c40e 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c | |||
@@ -286,7 +286,7 @@ static inline void ethoc_disable_rx_and_tx(struct ethoc *dev) | |||
286 | ethoc_write(dev, MODER, mode); | 286 | ethoc_write(dev, MODER, mode); |
287 | } | 287 | } |
288 | 288 | ||
289 | static int ethoc_init_ring(struct ethoc *dev, void* mem_start) | 289 | static int ethoc_init_ring(struct ethoc *dev, unsigned long mem_start) |
290 | { | 290 | { |
291 | struct ethoc_bd bd; | 291 | struct ethoc_bd bd; |
292 | int i; | 292 | int i; |
@@ -670,7 +670,7 @@ static int ethoc_open(struct net_device *dev) | |||
670 | if (ret) | 670 | if (ret) |
671 | return ret; | 671 | return ret; |
672 | 672 | ||
673 | ethoc_init_ring(priv, (void*)dev->mem_start); | 673 | ethoc_init_ring(priv, dev->mem_start); |
674 | ethoc_reset(priv); | 674 | ethoc_reset(priv); |
675 | 675 | ||
676 | if (netif_queue_stopped(dev)) { | 676 | if (netif_queue_stopped(dev)) { |