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: Thiago Farina <tfransosi@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index 79d4868e75a66606c77ed2e7a0a23543f5f0850d..492bff68bf2dd35d71434d2a68861d9e90373630 100644 (file)
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -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);

diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h
index 4fc875e5dcddfe2617436aa3059515594465714d..124141909e429d87ef876b1410d53d1b6beb4040 100644 (file)
--- a/drivers/net/tehuti.h
+++ b/drivers/net/tehuti.h
@@ -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)