korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 04:34:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

trivial: remove duplicated MIN macro from tehuti.

Browse Source 
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>
This commit is contained in:
Thiago Farina 2009-11-03 03:10:29 +00:00 committed by David S. Miller
parent 0d37f36ff9
commit df7641af49
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/tehuti.c
View File

@ -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 */ udelay(50); /* give hw a chance to clean fifo */
continue; continue;
} }
avail = MIN(avail, size); avail = min(avail, size);
DBG("about to push %d bytes starting %p size %d\n", avail, DBG("about to push %d bytes starting %p size %d\n", avail,
data, size); data, size);
bdx_tx_push_desc(priv, data, avail); bdx_tx_push_desc(priv, data, avail);

2
drivers/net/tehuti.h
View File

@ -76,8 +76,6 @@
#define FIFO_SIZE 4096 #define FIFO_SIZE 4096
#define FIFO_EXTRA_SPACE 1024 #define FIFO_EXTRA_SPACE 1024
#define MIN(x, y) ((x) < (y) ? (x) : (y))
#if BITS_PER_LONG == 64 #if BITS_PER_LONG == 64
# define H32_64(x) (u32) ((u64)(x) >> 32) # define H32_64(x) (u32) ((u64)(x) >> 32)
# define L32_64(x) (u32) ((u64)(x) & 0xffffffff) # define L32_64(x) (u32) ((u64)(x) & 0xffffffff)