patch-2.4.10 linux/drivers/char/cyclades.c
Next file: linux/drivers/char/decserial.c
Previous file: linux/drivers/char/console.c
Back to the patch index
Back to the overall index
- Lines: 29
- Date:
Fri Sep 14 14:04:07 2001
- Orig file:
v2.4.9/linux/drivers/char/cyclades.c
- Orig date:
Mon Aug 27 12:41:40 2001
diff -u --recursive --new-file v2.4.9/linux/drivers/char/cyclades.c linux/drivers/char/cyclades.c
@@ -1629,8 +1629,8 @@
for performance, but because of buffer boundaries, there
may be several steps to the operation */
while(0 < (small_count =
- min(unsigned int, (rx_bufsize - new_rx_get),
- min(unsigned int, (TTY_FLIPBUF_SIZE - tty->flip.count), char_count))
+ min_t(unsigned int, (rx_bufsize - new_rx_get),
+ min_t(unsigned int, (TTY_FLIPBUF_SIZE - tty->flip.count), char_count))
)) {
memcpy_fromio(tty->flip.char_buf_ptr,
(char *)(cinfo->base_addr
@@ -1724,9 +1724,9 @@
}
#ifdef BLOCKMOVE
while(0 < (small_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))))) {
+ min_t(unsigned int, (tx_bufsize - tx_put),
+ min_t(unsigned int, (SERIAL_XMIT_SIZE - info->xmit_tail),
+ min_t(unsigned int, info->xmit_cnt, char_count))))) {
memcpy_toio((char *)(cinfo->base_addr + tx_bufaddr + tx_put),
&info->xmit_buf[info->xmit_tail],
@@ -5819,3 +5819,4 @@
} /* cy_setup */
#endif /* MODULE */
+MODULE_LICENSE("GPL");
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)