ethoc: fix warning from 32bit build
authorAlan Cox <alan@linux.intel.com>
Mon, 12 Oct 2009 05:27:55 +0000 (05:27 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Oct 2009 07:23:06 +0000 (00:23 -0700)
drivers/net/ethoc.c: In function ‘ethoc_open’:
drivers/net/ethoc.c:667: warning: comparison of distinct pointer types
lacks a cast

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethoc.c

index 34d0c69e67f7bb53593cbe32b422db8d6979286d..1d338c6f53146961cb8f7cdbc7e139887f2f2465 100644 (file)
@@ -663,7 +663,8 @@ static int ethoc_open(struct net_device *dev)
                return ret;
 
        /* calculate the number of TX/RX buffers, maximum 128 supported */
                return ret;
 
        /* calculate the number of TX/RX buffers, maximum 128 supported */
-       num_bd = min(128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ);
+       num_bd = min_t(unsigned int,
+               128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ);
        priv->num_tx = max(min_tx, num_bd / 4);
        priv->num_rx = num_bd - priv->num_tx;
        ethoc_write(priv, TX_BD_NUM, priv->num_tx);
        priv->num_tx = max(min_tx, num_bd / 4);
        priv->num_rx = num_bd - priv->num_tx;
        ethoc_write(priv, TX_BD_NUM, priv->num_tx);