Skip to content

Commit

Permalink
trivial: remove duplicated MIN macro from tehuti.
Browse files Browse the repository at this point in the history
Since the kernel api already has the macro "min",
just use it instead of declaring another one.

Signed-off-by: Thiago Farina <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
tfarina authored and davem330 committed Nov 4, 2009
1 parent 0d37f36 commit df7641a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/net/tehuti.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/tehuti.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit df7641a

Please sign in to comment.