[Kernel-janitors] [PATCH] drivers/char/synclinkmp.c MIN/MAX removal

Patch (against 2.6.7) removes unnecessary min/max macros and changes
calls to use kernel.h macros instead.

Feedback is always welcome
Michael







--- linux-2.6.7-old/drivers/char/synclinkmp.c   2004-07-04 11:04:13.000000000 
+0200
+++ linux-2.6.7-new/drivers/char/synclinkmp.c   2004-07-04 14:56:46.000000000 
+0200
@@ -520,10 +520,6 @@
 /* number of characters left in xmit buffer before we ask for more */
 #define WAKEUP_CHARS 256
 
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-
 
 /* tty callbacks */
 
@@ -1013,8 +1009,8 @@
        }
 
        for (;;) {
-               c = MIN(count,
-                       MIN(info->max_frame_size - info->tx_count - 1,
+               c = min_t(int, count,
+                       min(info->max_frame_size - info->tx_count - 1,
                            info->max_frame_size - info->tx_put));
                if (c <= 0)
                        break;
@@ -1157,7 +1153,7 @@
                char_time = 1;
 
        if (timeout)
-               char_time = MIN(char_time, timeout);
+               char_time = min_t(unsigned long, char_time, timeout);
 
        if ( info->params.mode == MGSL_MODE_HDLC ) {
                while (info->tx_active) {
@@ -4831,7 +4827,7 @@
 
        if ( debug_level >= DEBUG_LEVEL_DATA )
                trace_block(info,info->rx_buf_list_ex[StartIndex].virt_addr,
-                       MIN(framesize,SCABUFSIZE),0);
+                       min_t(int, framesize,SCABUFSIZE),0);
 
        if (framesize) {
                if (framesize > info->max_frame_size)
@@ -4846,7 +4842,7 @@
                        info->icount.rxok++;
 
                        while(copy_count) {
-                               int partial_count = MIN(copy_count,SCABUFSIZE);
+                               int partial_count = min(copy_count,SCABUFSIZE);
                                memcpy( ptmp,
                                        info->rx_buf_list_ex[index].virt_addr,
                                        partial_count );
@@ -4905,14 +4901,14 @@
        SCADESC_EX *desc_ex;
 
        if ( debug_level >= DEBUG_LEVEL_DATA )
-               trace_block(info,buf, MIN(count,SCABUFSIZE), 1);
+               trace_block(info,buf, min_t(int, count,SCABUFSIZE), 1);
 
        /* Copy source buffer to one or more DMA buffers, starting with
         * the first transmit dma buffer.
         */
        for(i=0;;)
        {
-               copy_count = MIN(count,SCABUFSIZE);
+               copy_count = min_t(unsigned short,count,SCABUFSIZE);
 
                desc = &info->tx_buf_list[i];
                desc_ex = &info->tx_buf_list_ex[i];

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@xxxxxxxxxxxxxx
http://lists.osdl.org/mailman/listinfo/kernel-janitors