Commit df7641af authored by Thiago Farina's avatar Thiago Farina Committed by David S. Miller
Browse files

trivial: remove duplicated MIN macro from tehuti. 



Since the kernel api already has the macro "min",
just use it instead of declaring another one.

Signed-off-by: default avatarThiago Farina <tfransosi@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0d37f36f

drivers/net/tehuti.c

+1 −1
Original line number Diff line number Diff line
@@ -1878,7 +1878,7 @@ static void bdx_tx_push_desc_safe(struct bdx_priv *priv, void *data, int size) 
			udelay(50);	/* give hw a chance to clean fifo */

			continue;

		}

		avail = MIN(avail, size);

		avail = min(avail, size);

		DBG("about to push  %d bytes starting %p size %d\n", avail,

		    data, size);

		bdx_tx_push_desc(priv, data, avail);

drivers/net/tehuti.h

+0 −2
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ 
#define FIFO_SIZE  4096

#define FIFO_EXTRA_SPACE            1024



#define MIN(x, y)  ((x) < (y) ? (x) : (y))



#if BITS_PER_LONG == 64

#    define H32_64(x)  (u32) ((u64)(x) >> 32)

#    define L32_64(x)  (u32) ((u64)(x) & 0xffffffff)