Commit 5cf3e034 authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parent a0387169
...@@ -286,7 +286,7 @@ static inline void ethoc_disable_rx_and_tx(struct ethoc *dev) ...@@ -286,7 +286,7 @@ static inline void ethoc_disable_rx_and_tx(struct ethoc *dev)
ethoc_write(dev, MODER, mode); ethoc_write(dev, MODER, mode);
} }
static int ethoc_init_ring(struct ethoc *dev, void* mem_start) static int ethoc_init_ring(struct ethoc *dev, unsigned long mem_start)
{ {
struct ethoc_bd bd; struct ethoc_bd bd;
int i; int i;
...@@ -670,7 +670,7 @@ static int ethoc_open(struct net_device *dev) ...@@ -670,7 +670,7 @@ static int ethoc_open(struct net_device *dev)
if (ret) if (ret)
return ret; return ret;
ethoc_init_ring(priv, (void*)dev->mem_start); ethoc_init_ring(priv, dev->mem_start);
ethoc_reset(priv); ethoc_reset(priv);
if (netif_queue_stopped(dev)) { if (netif_queue_stopped(dev)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment