diff options
| author | Domen Puncer <domen@coderock.org> | 2005-05-15 16:01:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-05-15 16:01:50 -0700 |
| commit | 4b40033ef110b833986c1a1d958a951b695f9fbc (patch) | |
| tree | 78b9b23eb5469db6762bd761d58bf4ad3531467b /drivers/sbus | |
| parent | 4dbc30fb27ac4e647e6efadb382ff7d38c3d368e (diff) | |
| download | linux-3.10-4b40033ef110b833986c1a1d958a951b695f9fbc.tar.gz linux-3.10-4b40033ef110b833986c1a1d958a951b695f9fbc.tar.bz2 linux-3.10-4b40033ef110b833986c1a1d958a951b695f9fbc.zip | |
[SPARC]: Eliminate local MIN/MAX macros in drivers/sbus/char/aurora.c
From: Christophe Lucas <clucas@rotomalug.org>
min/max macros from kernel.h are safe, a lot of handcrafted MIN/MAX are
not.
Signed-off-by: Christophe Lucas <clucas@rotomalug.org>
Signed-off-by: Domen Puncer <domen@coderock.org>
Diffstat (limited to 'drivers/sbus')
| -rw-r--r-- | drivers/sbus/char/aurora.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/sbus/char/aurora.c b/drivers/sbus/char/aurora.c index e5fa1703856..650d5e924f4 100644 --- a/drivers/sbus/char/aurora.c +++ b/drivers/sbus/char/aurora.c @@ -81,10 +81,6 @@ unsigned char irqs[4] = { int irqhit=0; #endif -#ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif - static struct tty_driver *aurora_driver; static struct Aurora_board aurora_board[AURORA_NBOARD] = { {0,}, @@ -594,7 +590,7 @@ static void aurora_transmit(struct Aurora_board const * bp, int chip) &bp->r[chip]->r[CD180_TDR]); port->COR2 &= ~COR2_ETC; } - count = MIN(port->break_length, 0xff); + count = min(port->break_length, 0xff); sbus_writeb(CD180_C_ESC, &bp->r[chip]->r[CD180_TDR]); sbus_writeb(CD180_C_DELAY, @@ -1575,7 +1571,7 @@ static int aurora_write(struct tty_struct * tty, save_flags(flags); while (1) { cli(); - c = MIN(count, MIN(SERIAL_XMIT_SIZE - port->xmit_cnt - 1, + c = min(count, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1, SERIAL_XMIT_SIZE - port->xmit_head)); if (c <= 0) { restore_flags(flags); |