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

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

[Michael Veeck]

[-- 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-epca --]
[-- Type: text/plain, Size: 1318 bytes --]

--- linux-2.6.7-old/drivers/char/epca.c	2004-07-04 11:04:14.000000000 +0200
+++ linux-2.6.7-new/drivers/char/epca.c	2004-07-04 15:29:04.543278544 +0200
@@ -74,7 +74,6 @@
 #define DIGIINFOMAJOR       35  /* For Digi specific ioctl */ 
 
 
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
 #define MAXCARDS 7
 #define epcaassert(x, msg)  if (!(x)) epca_error(__LINE__, msg)
 
@@ -826,7 +825,7 @@
 			bytesAvailable will then take on this newly calculated value.
 		---------------------------------------------------------------------- */
 
-		bytesAvailable = MIN(dataLen, bytesAvailable);
+		bytesAvailable = min(dataLen, bytesAvailable);
 
 		/* First we read the data in from the file system into a temp buffer */
 
@@ -921,7 +920,7 @@
 			space; reduce the amount of data to fit the space.
 	---------------------------------------------------------------------- */
 
-	bytesAvailable = MIN(remain, bytesAvailable);
+	bytesAvailable = min(remain, bytesAvailable);
 
 	txwinon(ch);
 	while (bytesAvailable > 0) 
@@ -932,7 +931,7 @@
 			data copy fills to the end of card buffer.
 		------------------------------------------------------------------- */
 
-		dataLen = MIN(bytesAvailable, dataLen);
+		dataLen = min(bytesAvailable, dataLen);
 		memcpy(ch->txptr + head, buf, dataLen);
 		buf += dataLen;
 		head += dataLen;

[-- 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

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

[Michael Veeck]

[-- 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-esp --]
[-- Type: text/plain, Size: 1164 bytes --]

--- linux-2.6.7-old/drivers/char/esp.c	2004-07-04 11:04:13.000000000 +0200
+++ linux-2.6.7-new/drivers/char/esp.c	2004-07-04 15:03:22.346728056 +0200
@@ -19,7 +19,7 @@
  *
  *  rs_set_termios fixed to look also for changes of the input
  *      flags INPCK, BRKINT, PARMRK, IGNPAR and IGNBRK.
- *                                            Bernd Anh���upl 05/17/96.
+ *                                            Bernd Anh���������pl 05/17/96.
  *
  * --- End of notices from serial.c ---
  *
@@ -140,7 +140,7 @@
 
 static void change_speed(struct esp_struct *info);
 static void rs_wait_until_sent(struct tty_struct *, int);
-	
+
 /*
  * The ESP card has a clock rate of 14.7456 MHz (that is, 2**ESPC_SCALE
  * times the normal 1.8432 Mhz clock of most serial boards).
@@ -150,10 +150,6 @@
 /* Standard COM flags (except for COM4, because of the 8514 problem) */
 #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
 
-#ifndef MIN
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
-#endif
-
 /*
  * tmp_buf is used as a temporary buffer by serial_write.  We need to
  * lock it in case the memcpy_fromfs blocks while swapping in a page,

[-- 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

Re: [Kernel-janitors] [PATCH] drivers/char/esp.c MIN/MAX removal

[maximilian attems]

[-- Attachment #1: Type: text/plain, Size: 1574 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/esp.c	2004-07-04 11:04:13.000000000 +0200
> +++ linux-2.6.7-new/drivers/char/esp.c	2004-07-04 15:03:22.346728056 +0200
> @@ -19,7 +19,7 @@
>   *
>   *  rs_set_termios fixed to look also for changes of the input
>   *      flags INPCK, BRKINT, PARMRK, IGNPAR and IGNBRK.
> - *                                            Bernd Anh?upl 05/17/96.
> + *                                            Bernd Anh???pl 05/17/96.
>   *
>   * --- End of notices from serial.c ---
>   *
utf8?
> @@ -140,7 +140,7 @@
>  
>  static void change_speed(struct esp_struct *info);
>  static void rs_wait_until_sent(struct tty_struct *, int);
> -	
> +
>  /*
>   * The ESP card has a clock rate of 14.7456 MHz (that is, 2**ESPC_SCALE
>   * times the normal 1.8432 Mhz clock of most serial boards).
space fix
> @@ -150,10 +150,6 @@
>  /* Standard COM flags (except for COM4, because of the 8514 problem) */
>  #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
>  
> -#ifndef MIN
> -#define MIN(a,b)	((a) < (b) ? (a) : (b))
> -#endif
> -
>  /*
>   * tmp_buf is used as a temporary buffer by serial_write.  We need to
>   * lock it in case the memcpy_fromfs blocks while swapping in a page,
real min max stuff!

please do not random "fixes" in parallell,
if a file really needs white space fixes use automatic tool for that.
thanks maks

[-- 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