* [Kernel-janitors] [PATCH] drivers/char/synclink.c MIN/MAX removal
2004-07-03 15:05 [Kernel-janitors] [PATCH] drivers/char/specialix.c MIN/MAX removal Michael Veeck
@ 2004-07-03 15:05 ` Michael Veeck
2004-07-03 15:06 ` [Kernel-janitors] [PATCH] drivers/char/serial167.c " Michael Veeck
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Michael Veeck @ 2004-07-03 15:05 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 150 bytes --]
Patch (against 2.6.7) removes unnecessary min/max macros and changes
calls to use kernel.h macros instead.
Feedback is always welcome
Michael
[-- Attachment #2: patch-char-synclink --]
[-- Type: text/plain, Size: 2764 bytes --]
--- linux-2.6.7-old/drivers/char/synclink.c 2004-07-04 11:04:14.000000000 +0200
+++ linux-2.6.7-new/drivers/char/synclink.c 2004-07-04 15:39:15.339423416 +0200
@@ -942,10 +942,6 @@
static void mgsl_change_params(struct mgsl_struct *info);
static void mgsl_wait_until_sent(struct tty_struct *tty, int timeout);
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-
/*
* 1st function defined in .text section. Calling this function in
* init_module() followed by a breakpoint allows a remote debugger
@@ -2258,8 +2254,8 @@
if (from_user) {
down(&tmp_buf_sem);
while (1) {
- c = MIN(count,
- MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
+ c = min_t(int, count,
+ min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
SERIAL_XMIT_SIZE - info->xmit_head));
if (c <= 0)
break;
@@ -2272,7 +2268,7 @@
break;
}
spin_lock_irqsave(&info->irq_spinlock,flags);
- c = MIN(c, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
+ c = min_t(int, c, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
SERIAL_XMIT_SIZE - info->xmit_head));
memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c);
info->xmit_head = ((info->xmit_head + c) &
@@ -2287,8 +2283,8 @@
} else {
while (1) {
spin_lock_irqsave(&info->irq_spinlock,flags);
- c = MIN(count,
- MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
+ c = min_t(int, count,
+ min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
SERIAL_XMIT_SIZE - info->xmit_head));
if (c <= 0) {
spin_unlock_irqrestore(&info->irq_spinlock,flags);
@@ -3326,7 +3322,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 ||
info->params.mode == MGSL_MODE_RAW ) {
@@ -6779,7 +6775,7 @@
if ( debug_level >= DEBUG_LEVEL_DATA )
mgsl_trace_block(info,info->rx_buffer_list[StartIndex].virt_addr,
- MIN(framesize,DMABUFFERSIZE),0);
+ min_t(int, framesize, DMABUFFERSIZE),0);
if (framesize) {
if ( ( (info->params.crc_type & HDLC_CRC_RETURN_EX) &&
@@ -6996,7 +6992,7 @@
if ( debug_level >= DEBUG_LEVEL_DATA )
mgsl_trace_block(info,info->rx_buffer_list[CurrentIndex].virt_addr,
- MIN(framesize,DMABUFFERSIZE),0);
+ min_t(int, framesize, DMABUFFERSIZE),0);
if (framesize) {
/* copy dma buffer(s) to contiguous intermediate buffer */
@@ -7056,7 +7052,7 @@
DMABUFFERENTRY *pBufEntry;
if ( debug_level >= DEBUG_LEVEL_DATA )
- mgsl_trace_block(info,Buffer, MIN(BufferSize,DMABUFFERSIZE), 1);
+ mgsl_trace_block(info,Buffer, min_t(int, BufferSize, DMABUFFERSIZE), 1);
if (info->params.flags & HDLC_FLAG_HDLC_LOOPMODE) {
/* set CMR:13 to start transmit when
[-- Attachment #3: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 6+ messages in thread* [Kernel-janitors] [PATCH] drivers/char/serial167.c MIN/MAX removal
2004-07-03 15:05 [Kernel-janitors] [PATCH] drivers/char/specialix.c MIN/MAX removal Michael Veeck
2004-07-03 15:05 ` [Kernel-janitors] [PATCH] drivers/char/synclink.c " Michael Veeck
@ 2004-07-03 15:06 ` Michael Veeck
2004-07-03 15:08 ` [Kernel-janitors] [PATCH] drivers/char/synclinkmp.c " Michael Veeck
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Michael Veeck @ 2004-07-03 15:06 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 150 bytes --]
Patch (against 2.6.7) removes unnecessary min/max macros and changes
calls to use kernel.h macros instead.
Feedback is always welcome
Michael
[-- Attachment #2: patch-char-serial167 --]
[-- Type: text/plain, Size: 1559 bytes --]
--- linux-2.6.7-old/drivers/char/serial167.c 2004-07-04 11:04:14.000000000 +0200
+++ linux-2.6.7-new/drivers/char/serial167.c 2004-07-04 15:54:32.909931496 +0200
@@ -83,10 +83,6 @@
#undef CYCLOM_16Y_HACK
#define CYCLOM_ENABLE_MONITORING
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-
#define WAKEUP_CHARS 256
#define STD_COM_FLAGS (0)
@@ -1238,8 +1234,8 @@
if (from_user) {
down(&tmp_buf_sem);
while (1) {
- c = MIN(count, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
- SERIAL_XMIT_SIZE - info->xmit_head));
+ c = min_t(int, count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
+ SERIAL_XMIT_SIZE - info->xmit_head));
if (c <= 0)
break;
@@ -1251,8 +1247,8 @@
}
local_irq_save(flags);
- c = MIN(c, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
- SERIAL_XMIT_SIZE - info->xmit_head));
+ c = min_t(int, c, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
+ SERIAL_XMIT_SIZE - info->xmit_head));
memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c);
info->xmit_head = (info->xmit_head + c) & (SERIAL_XMIT_SIZE-1);
info->xmit_cnt += c;
@@ -1266,8 +1262,8 @@
} else {
while (1) {
local_irq_save(flags);
- c = MIN(count, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
- SERIAL_XMIT_SIZE - info->xmit_head));
+ c = min_t(int, count, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
+ SERIAL_XMIT_SIZE - info->xmit_head));
if (c <= 0) {
local_irq_restore(flags);
break;
[-- Attachment #3: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 6+ messages in thread* [Kernel-janitors] [PATCH] drivers/char/synclinkmp.c MIN/MAX removal
2004-07-03 15:05 [Kernel-janitors] [PATCH] drivers/char/specialix.c MIN/MAX removal Michael Veeck
2004-07-03 15:05 ` [Kernel-janitors] [PATCH] drivers/char/synclink.c " Michael Veeck
2004-07-03 15:06 ` [Kernel-janitors] [PATCH] drivers/char/serial167.c " Michael Veeck
@ 2004-07-03 15:08 ` Michael Veeck
2004-07-03 15:09 ` [Kernel-janitors] [PATCH] drivers/char/selection.c " Michael Veeck
2004-07-11 13:05 ` [Kernel-janitors] [PATCH] drivers/char/synclink.c " maximilian attems
4 siblings, 0 replies; 6+ messages in thread
From: Michael Veeck @ 2004-07-03 15:08 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 150 bytes --]
Patch (against 2.6.7) removes unnecessary min/max macros and changes
calls to use kernel.h macros instead.
Feedback is always welcome
Michael
[-- Attachment #2: patch-char-synclinkmp --]
[-- Type: text/plain, Size: 1894 bytes --]
--- 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];
[-- Attachment #3: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 6+ messages in thread* [Kernel-janitors] [PATCH] drivers/char/selection.c MIN/MAX removal
2004-07-03 15:05 [Kernel-janitors] [PATCH] drivers/char/specialix.c MIN/MAX removal Michael Veeck
` (2 preceding siblings ...)
2004-07-03 15:08 ` [Kernel-janitors] [PATCH] drivers/char/synclinkmp.c " Michael Veeck
@ 2004-07-03 15:09 ` Michael Veeck
2004-07-11 13:05 ` [Kernel-janitors] [PATCH] drivers/char/synclink.c " maximilian attems
4 siblings, 0 replies; 6+ messages in thread
From: Michael Veeck @ 2004-07-03 15:09 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 150 bytes --]
Patch (against 2.6.7) removes unnecessary min/max macros and changes
calls to use kernel.h macros instead.
Feedback is always welcome
Michael
[-- Attachment #2: patch-char-selection --]
[-- Type: text/plain, Size: 680 bytes --]
--- linux-2.6.7-old/drivers/char/selection.c 2004-07-04 11:04:14.000000000 +0200
+++ linux-2.6.7-new/drivers/char/selection.c 2004-07-04 15:46:04.050289920 +0200
@@ -26,10 +26,6 @@
#include <linux/tiocl.h>
#include <linux/console.h>
-#ifndef MIN
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-
/* Don't take this from <ctype.h>: 011-015 on the screen aren't spaces */
#define isspace(c) ((c) == ' ')
@@ -295,7 +291,7 @@
continue;
}
count = sel_buffer_lth - pasted;
- count = MIN(count, tty->ldisc.receive_room(tty));
+ count = min(count, tty->ldisc.receive_room(tty));
tty->ldisc.receive_buf(tty, sel_buffer + pasted, 0, count);
pasted += count;
}
[-- Attachment #3: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Kernel-janitors] [PATCH] drivers/char/synclink.c MIN/MAX removal
2004-07-03 15:05 [Kernel-janitors] [PATCH] drivers/char/specialix.c MIN/MAX removal Michael Veeck
` (3 preceding siblings ...)
2004-07-03 15:09 ` [Kernel-janitors] [PATCH] drivers/char/selection.c " Michael Veeck
@ 2004-07-11 13:05 ` maximilian attems
4 siblings, 0 replies; 6+ messages in thread
From: maximilian attems @ 2004-07-11 13:05 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 3217 bytes --]
On Sun, 04 Jul 2004, Michael Veeck wrote:
> 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/synclink.c 2004-07-04 11:04:14.000000000 +0200
> +++ linux-2.6.7-new/drivers/char/synclink.c 2004-07-04 15:39:15.339423416 +0200
> @@ -942,10 +942,6 @@
> static void mgsl_change_params(struct mgsl_struct *info);
> static void mgsl_wait_until_sent(struct tty_struct *tty, int timeout);
>
> -#ifndef MIN
> -#define MIN(a,b) ((a) < (b) ? (a) : (b))
> -#endif
> -
> /*
> * 1st function defined in .text section. Calling this function in
> * init_module() followed by a breakpoint allows a remote debugger
> @@ -2258,8 +2254,8 @@
> if (from_user) {
> down(&tmp_buf_sem);
> while (1) {
> - c = MIN(count,
> - MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
> + c = min_t(int, count,
> + min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
> SERIAL_XMIT_SIZE - info->xmit_head));
> if (c <= 0)
> break;
> @@ -2272,7 +2268,7 @@
> break;
> }
> spin_lock_irqsave(&info->irq_spinlock,flags);
> - c = MIN(c, MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
> + c = min_t(int, c, min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
> SERIAL_XMIT_SIZE - info->xmit_head));
> memcpy(info->xmit_buf + info->xmit_head, tmp_buf, c);
> info->xmit_head = ((info->xmit_head + c) &
> @@ -2287,8 +2283,8 @@
> } else {
> while (1) {
> spin_lock_irqsave(&info->irq_spinlock,flags);
> - c = MIN(count,
> - MIN(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
> + c = min_t(int, count,
> + min(SERIAL_XMIT_SIZE - info->xmit_cnt - 1,
> SERIAL_XMIT_SIZE - info->xmit_head));
> if (c <= 0) {
> spin_unlock_irqrestore(&info->irq_spinlock,flags);
> @@ -3326,7 +3322,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 ||
> info->params.mode == MGSL_MODE_RAW ) {
> @@ -6779,7 +6775,7 @@
>
> if ( debug_level >= DEBUG_LEVEL_DATA )
> mgsl_trace_block(info,info->rx_buffer_list[StartIndex].virt_addr,
> - MIN(framesize,DMABUFFERSIZE),0);
> + min_t(int, framesize, DMABUFFERSIZE),0);
trailing space
>
> if (framesize) {
> if ( ( (info->params.crc_type & HDLC_CRC_RETURN_EX) &&
> @@ -6996,7 +6992,7 @@
>
> if ( debug_level >= DEBUG_LEVEL_DATA )
> mgsl_trace_block(info,info->rx_buffer_list[CurrentIndex].virt_addr,
> - MIN(framesize,DMABUFFERSIZE),0);
> + min_t(int, framesize, DMABUFFERSIZE),0);
>
> if (framesize) {
> /* copy dma buffer(s) to contiguous intermediate buffer */
> @@ -7056,7 +7052,7 @@
> DMABUFFERENTRY *pBufEntry;
>
> if ( debug_level >= DEBUG_LEVEL_DATA )
> - mgsl_trace_block(info,Buffer, MIN(BufferSize,DMABUFFERSIZE), 1);
> + mgsl_trace_block(info,Buffer, min_t(int, BufferSize, DMABUFFERSIZE), 1);
ditto
>
> if (info->params.flags & HDLC_FLAG_HDLC_LOOPMODE) {
> /* set CMR:13 to start transmit when
corrected for the coming kjt, but please take care.
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 6+ messages in thread