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

[PATCH] drivers/macintosh/macserial.c MIN/MAX removal

Removes unnecessary min/max macros and changes calls to use kernel.h macros
instead.
Signed-off-by: default avatarMaximilian Attems <janitor@sternwelten.at>
Cc: <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e13246e0
...@@ -158,10 +158,6 @@ static void dma_init(struct mac_serial * info); ...@@ -158,10 +158,6 @@ static void dma_init(struct mac_serial * info);
static void rxdma_start(struct mac_serial * info, int current); static void rxdma_start(struct mac_serial * info, int current);
static void rxdma_to_tty(struct mac_serial * info); static void rxdma_to_tty(struct mac_serial * info);
#ifndef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
/* /*
* tmp_buf is used as a temporary buffer by serial_write. We need to * tmp_buf is used as a temporary buffer by serial_write. We need to
* lock it in case the copy_from_user blocks while swapping in a page, * lock it in case the copy_from_user blocks while swapping in a page,
...@@ -1485,9 +1481,8 @@ static int rs_write(struct tty_struct * tty, int from_user, ...@@ -1485,9 +1481,8 @@ static int rs_write(struct tty_struct * tty, int from_user,
if (from_user) { if (from_user) {
down(&tmp_buf_sem); down(&tmp_buf_sem);
while (1) { while (1) {
c = MIN(count, c = min_t(int, count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1, SERIAL_XMIT_SIZE - info->xmit_head));
SERIAL_XMIT_SIZE - info->xmit_head));
if (c <= 0) if (c <= 0)
break; break;
...@@ -1498,8 +1493,8 @@ static int rs_write(struct tty_struct * tty, int from_user, ...@@ -1498,8 +1493,8 @@ static int rs_write(struct tty_struct * tty, int from_user,
break; break;
} }
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
c = MIN(c, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1, c = min_t(int, c, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
SERIAL_XMIT_SIZE - info->xmit_head)); SERIAL_XMIT_SIZE - info->xmit_head));
memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c); memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c);
info->xmit_head = ((info->xmit_head + c) & info->xmit_head = ((info->xmit_head + c) &
(SERIAL_XMIT_SIZE-1)); (SERIAL_XMIT_SIZE-1));
...@@ -1513,9 +1508,8 @@ static int rs_write(struct tty_struct * tty, int from_user, ...@@ -1513,9 +1508,8 @@ static int rs_write(struct tty_struct * tty, int from_user,
} else { } else {
while (1) { while (1) {
spin_lock_irqsave(&info->lock, flags); spin_lock_irqsave(&info->lock, flags);
c = MIN(count, c = min_t(int, count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1, SERIAL_XMIT_SIZE - info->xmit_head));
SERIAL_XMIT_SIZE - info->xmit_head));
if (c <= 0) { if (c <= 0) {
spin_unlock_irqrestore(&info->lock, flags); spin_unlock_irqrestore(&info->lock, flags);
break; break;
...@@ -2052,7 +2046,7 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout) ...@@ -2052,7 +2046,7 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
} else if (char_time == 0) } else if (char_time == 0)
char_time = 1; char_time = 1;
if (timeout) if (timeout)
char_time = MIN(char_time, timeout); char_time = min_t(unsigned long, char_time, timeout);
while ((read_zsreg(info->zs_channel, 1) & ALL_SNT) == 0) { while ((read_zsreg(info->zs_channel, 1) & ALL_SNT) == 0) {
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
schedule_timeout(char_time); schedule_timeout(char_time);
......
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