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

• Lines: 19
• Date: Wed Aug 15 01:22:15 2001
• Orig file: v2.4.8/linux/drivers/char/dsp56k.c
• Orig date: Wed Jul 25 17:10:19 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/char/dsp56k.c linux/drivers/char/dsp56k.c
@@ -59,9 +59,6 @@
 #define DSP56K_TRANSMIT		(dsp56k_host_interface.isr & DSP56K_ISR_TXDE)
 #define DSP56K_RECEIVE		(dsp56k_host_interface.isr & DSP56K_ISR_RXDF)
 
-#define max(a,b) ((a) > (b) ? (a) : (b))
-#define min(a,b) ((a) < (b) ? (a) : (b))
-
 #define wait_some(n) \
 { \
 	set_current_state(TASK_INTERRUPTIBLE); \
@@ -72,7 +69,7 @@
 { \
 	long i, t, m; \
 	while (count > 0) { \
-		m = min(count, maxio); \
+		m = min(unsigned long, count, maxio); \
 		for (i = 0; i < m; i++) { \
 			for (t = 0; t < timeout && !ENABLE; t++) \
 				wait_some(HZ/50); \