From 5cf3e03457aa905f17f9765702850316b69aad1e Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 7 Jul 2010 18:23:19 -0700 Subject: [PATCH] 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 --- drivers/net/ethoc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index db519a8..5bb6bb7 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) 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; int i; @@ -670,7 +670,7 @@ static int ethoc_open(struct net_device *dev) if (ret) return ret; - ethoc_init_ring(priv, (void*)dev->mem_start); + ethoc_init_ring(priv, dev->mem_start); ethoc_reset(priv); if (netif_queue_stopped(dev)) { -- 2.7.4