Patch (against 2.6.7) removes unnecessary min/max macros and changes
calls to use kernel.h macros instead.
Feedback is always welcome
Michael
Signed-off-by: Maximilian Attems <[email protected]>
---
linux-2.6.9-rc1-bk7-max/drivers/char/serial167.c | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff -puN drivers/char/serial167.c~min-max-char_serial167 drivers/char/serial167.c
--- linux-2.6.9-rc1-bk7/drivers/char/serial167.c~min-max-char_serial167 2004-09-01 19:34:12.000000000 +0200
+++ linux-2.6.9-rc1-bk7-max/drivers/char/serial167.c 2004-09-01 19:34:12.000000000 +0200
@@ -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,8 +1234,8 @@ cy_write(struct tty_struct * tty, int fr
if (from_user) {
down(&tmp_buf_sem);
while (1) {
- c = MIN(count, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
- SERIAL_XMIT_SIZE - info->xmit_head));
+ c = min_t(int, count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
+ SERIAL_XMIT_SIZE - info->xmit_head));
if (c <= 0)
break;
@@ -1251,8 +1247,8 @@ cy_write(struct tty_struct * tty, int fr
}
local_irq_save(flags);
- c = MIN(c, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
- SERIAL_XMIT_SIZE - info->xmit_head));
+ 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);
info->xmit_cnt += c;
@@ -1266,8 +1262,8 @@ cy_write(struct tty_struct * tty, int fr
} else {
while (1) {
local_irq_save(flags);
- c = MIN(count, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
- SERIAL_XMIT_SIZE - info->xmit_head));
+ 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);
break;
_