Skip to content

Commit

Permalink
[SPARC]: Eliminate local MIN/MAX macros in drivers/sbus/char/aurora.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Domen Puncer authored and David S. Miller committed May 15, 2005
1 parent 4dbc30f commit 4b40033
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/sbus/char/aurora.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,},
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 4b40033

Please sign in to comment.