Commit b234a50e authored by Maximilian Attems's avatar Maximilian Attems Committed by Linus Torvalds

[PATCH] drivers/char/rocket.c MIN/MAX removal

Signed-off-by: default avatarMaximilian Attems <janitor@sternwelten.at>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent af95469c
......@@ -389,7 +389,7 @@ static void rp_do_transmit(struct r_port *info)
while (1) {
if (tty->stopped || tty->hw_stopped)
break;
c = MIN(info->xmit_fifo_room, MIN(info->xmit_cnt, XMIT_BUF_SIZE - info->xmit_tail));
c = min(info->xmit_fifo_room, min(info->xmit_cnt, XMIT_BUF_SIZE - info->xmit_tail));
if (c <= 0 || info->xmit_fifo_room <= 0)
break;
sOutStrW(sGetTxRxDataIO(cp), (unsigned short *) (info->xmit_buf + info->xmit_tail), c / 2);
......@@ -1658,7 +1658,7 @@ static int rp_write(struct tty_struct *tty, int from_user,
* into FIFO. Use the write queue for temp storage.
*/
if (!tty->stopped && !tty->hw_stopped && info->xmit_cnt == 0 && info->xmit_fifo_room > 0) {
c = MIN(count, info->xmit_fifo_room);
c = min(count, info->xmit_fifo_room);
b = buf;
if (from_user) {
if (copy_from_user(info->xmit_buf, buf, c)) {
......@@ -1668,7 +1668,7 @@ static int rp_write(struct tty_struct *tty, int from_user,
if (info->tty == 0)
goto end;
b = info->xmit_buf;
c = MIN(c, info->xmit_fifo_room);
c = min(c, info->xmit_fifo_room);
}
/* Push data into FIFO, 2 bytes at a time */
......@@ -1696,7 +1696,7 @@ static int rp_write(struct tty_struct *tty, int from_user,
if (info->tty == 0) /* Seemingly obligatory check... */
goto end;
c = MIN(count, MIN(XMIT_BUF_SIZE - info->xmit_cnt - 1, XMIT_BUF_SIZE - info->xmit_head));
c = min(count, min(XMIT_BUF_SIZE - info->xmit_cnt - 1, XMIT_BUF_SIZE - info->xmit_head));
if (c <= 0)
break;
......
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