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/isicom.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff -puN drivers/char/isicom.c~min-max-char_isicom drivers/char/isicom.c
--- linux-2.6.9-rc1-bk7/drivers/char/isicom.c~min-max-char_isicom 2004-09-01 20:17:48.000000000 +0200
+++ linux-2.6.9-rc1-bk7-max/drivers/char/isicom.c 2004-09-01 21:07:32.000000000 +0200
@@ -389,7 +389,7 @@ static void isicom_tx(unsigned long _dat
tty = port->tty;
save_flags(flags); cli();
- txcount = MIN(TX_SIZE, port->xmit_cnt);
+ txcount = min_t(short, TX_SIZE, port->xmit_cnt);
if ((txcount <= 0) || tty->stopped || tty->hw_stopped) {
restore_flags(flags);
continue;
@@ -421,7 +421,7 @@ static void isicom_tx(unsigned long _dat
residue = NO;
wrd = 0;
while (1) {
- cnt = MIN(txcount, (SERIAL_XMIT_SIZE - port->xmit_tail));
+ cnt = min_t(int, txcount, (SERIAL_XMIT_SIZE - port->xmit_tail));
if (residue == YES) {
residue = NO;
if (cnt > 0) {
@@ -650,7 +650,7 @@ static irqreturn_t isicom_interrupt(int
}
}
else { /* Data Packet */
- count = MIN(byte_count, (TTY_FLIPBUF_SIZE - tty->flip.count));
+ count = min_t(unsigned short, byte_count, (TTY_FLIPBUF_SIZE - tty->flip.count));
#ifdef ISICOM_DEBUG
printk(KERN_DEBUG "ISICOM: Intr: Can rx %d of %d bytes.\n",
count, byte_count);
@@ -1163,8 +1163,8 @@ static int isicom_write(struct tty_struc
save_flags(flags);
while(1) {
cli();
- cnt = MIN(count, MIN(SERIAL_XMIT_SIZE - port->xmit_cnt - 1,
- SERIAL_XMIT_SIZE - port->xmit_head));
+ cnt = min_t(int, count, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1,
+ SERIAL_XMIT_SIZE - port->xmit_head));
if (cnt <= 0)
break;
@@ -1180,8 +1180,8 @@ static int isicom_write(struct tty_struc
return -EFAULT;
}
cli();
- cnt = MIN(cnt, MIN(SERIAL_XMIT_SIZE - port->xmit_cnt - 1,
- SERIAL_XMIT_SIZE - port->xmit_head));
+ cnt = min_t(int, cnt, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1,
+ SERIAL_XMIT_SIZE - port->xmit_head));
memcpy(port->xmit_buf + port->xmit_head, tmp_buf, cnt);
}
else
_