diff options
| author | Thiago Farina <tfransosi@gmail.com> | 2009-11-03 04:10:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-04 14:06:24 +0100 |
| commit | df7641af498c1575f5e9719cb391a1fa8159db1b (patch) | |
| tree | 38a7beb7c2e44689d9ca5a2bf8c3a663f13f9455 | |
| parent | cnic: ensure ulp_type is not negative (diff) | |
| download | linux-df7641af498c1575f5e9719cb391a1fa8159db1b.tar.xz linux-df7641af498c1575f5e9719cb391a1fa8159db1b.zip | |
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>
| -rw-r--r-- | drivers/net/tehuti.c | 2 | ||||
| -rw-r--r-- | drivers/net/tehuti.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 79d4868e75a6..492bff68bf2d 100644 --- 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 4fc875e5dcdd..124141909e42 100644 --- 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) |