patch-2.4.9 linux/drivers/char/cyclades.c

• Lines: 33
• Date: Wed Aug 15 01:22:15 2001
• Orig file: v2.4.8/linux/drivers/char/cyclades.c
• Orig date: Tue Jul 3 17:08:19 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/char/cyclades.c linux/drivers/char/cyclades.c
@@ -628,8 +628,6 @@
 #define PAUSE ;
 #endif
 
-#define cy_min(a,b) (((a)<(b))?(a):(b))
-
 /*
  * Include section 
  */
@@ -1631,8 +1629,8 @@
 	       for performance, but because of buffer boundaries, there
 	       may be several steps to the operation */
 	    while(0 < (small_count = 
-		       cy_min((rx_bufsize - new_rx_get),
-		       cy_min((TTY_FLIPBUF_SIZE - tty->flip.count), char_count))
+		       min(unsigned int, (rx_bufsize - new_rx_get),
+		       min(unsigned int, (TTY_FLIPBUF_SIZE - tty->flip.count), char_count))
 		 )) {
 		memcpy_fromio(tty->flip.char_buf_ptr,
 			      (char *)(cinfo->base_addr
@@ -1726,9 +1724,9 @@
 	}
 #ifdef BLOCKMOVE
 	while(0 < (small_count = 
-		   cy_min((tx_bufsize - tx_put),
-		   cy_min ((SERIAL_XMIT_SIZE - info->xmit_tail),
-			cy_min(info->xmit_cnt, char_count))))){
+		   min(unsigned int, (tx_bufsize - tx_put),
+		       min(unsigned int, (SERIAL_XMIT_SIZE - info->xmit_tail),
+			   min(unsigned int, info->xmit_cnt, char_count))))) {
 
 	    memcpy_toio((char *)(cinfo->base_addr + tx_bufaddr + tx_put),
 			&info->xmit_buf[info->xmit_tail],