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

[PATCH] drivers/char/serial167.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 53f646e5
......@@ -83,10 +83,6 @@
#undef CYCLOM_16Y_HACK
#define CYCLOM_ENABLE_MONITORING
#ifndef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
#define WAKEUP_CHARS 256
#define STD_COM_FLAGS (0)
......@@ -1238,7 +1234,7 @@ cy_write(struct tty_struct * tty, int from_user,
if (from_user) {
down(&tmp_buf_sem);
while (1) {
c = MIN(count, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
c = min_t(int, count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
SERIAL_XMIT_SIZE - info->xmit_head));
if (c <= 0)
break;
......@@ -1251,7 +1247,7 @@ cy_write(struct tty_struct * tty, int from_user,
}
local_irq_save(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));
memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c);
info->xmit_head = (info->xmit_head + c) & (SERIAL_XMIT_SIZE-1);
......@@ -1266,7 +1262,7 @@ cy_write(struct tty_struct * tty, int from_user,
} else {
while (1) {
local_irq_save(flags);
c = MIN(count, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
c = min_t(int, count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
SERIAL_XMIT_SIZE - info->xmit_head));
if (c <= 0) {
local_irq_restore(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