Commit 4b40033e authored by Domen Puncer's avatar Domen Puncer Committed by David S. Miller

[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: default avatarChristophe Lucas <clucas@rotomalug.org>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
parent 4dbc30fb
...@@ -81,10 +81,6 @@ unsigned char irqs[4] = { ...@@ -81,10 +81,6 @@ unsigned char irqs[4] = {
int irqhit=0; int irqhit=0;
#endif #endif
#ifndef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
static struct tty_driver *aurora_driver; static struct tty_driver *aurora_driver;
static struct Aurora_board aurora_board[AURORA_NBOARD] = { static struct Aurora_board aurora_board[AURORA_NBOARD] = {
{0,}, {0,},
...@@ -594,7 +590,7 @@ static void aurora_transmit(struct Aurora_board const * bp, int chip) ...@@ -594,7 +590,7 @@ static void aurora_transmit(struct Aurora_board const * bp, int chip)
&bp->r[chip]->r[CD180_TDR]); &bp->r[chip]->r[CD180_TDR]);
port->COR2 &= ~COR2_ETC; port->COR2 &= ~COR2_ETC;
} }
count = MIN(port->break_length, 0xff); count = min(port->break_length, 0xff);
sbus_writeb(CD180_C_ESC, sbus_writeb(CD180_C_ESC,
&bp->r[chip]->r[CD180_TDR]); &bp->r[chip]->r[CD180_TDR]);
sbus_writeb(CD180_C_DELAY, sbus_writeb(CD180_C_DELAY,
...@@ -1575,7 +1571,7 @@ static int aurora_write(struct tty_struct * tty, ...@@ -1575,7 +1571,7 @@ static int aurora_write(struct tty_struct * tty,
save_flags(flags); save_flags(flags);
while (1) { while (1) {
cli(); 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)); SERIAL_XMIT_SIZE - port->xmit_head));
if (c <= 0) { if (c <= 0) {
restore_flags(flags); restore_flags(flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment