drivers/char/pcxx.c MIN/MAX removal

PATCH In review [email protected] 1 participant 1 message Sep 1, 2004 Char and misc drivers

lore

Share & tools

lore

[email protected]

author

2004-09-01 21:36 UTC #0 lore raw

PATCH 7/25 drivers/char/pcxx.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

Signed-off-by Maximilian Attems <[email protected]>

---

 linux-2.6.9-rc1-bk7-max/drivers/char/pcxx.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

drivers/char/pcxx.c renamed from drivers/char/pcxx.c~min-max-char_pcxx +3 -4

diff -puN drivers/char/pcxx.c~min-max-char_pcxx drivers/char/pcxx.c
@@ -130,7 +130,6 @@ static struct channel    *digi_channels;
 int pcxx_ncook=sizeof(pcxx_cook);
 int pcxx_nbios=sizeof(pcxx_bios);
 
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
 #define pcxxassert(x, msg)  if(!(x)) pcxx_error(__LINE__, msg)
 
 #define FEPTIMEOUT 200000

@@ -626,7 +625,7 @@ static int pcxe_write(struct tty_struct 
 		
 		tail &= (size - 1);
 		stlen = (head >= tail) ? (size - (head - tail) - 1) : (tail - head - 1);
-		count = MIN(stlen, count);
+		count = min(stlen, count);
 		memoff(ch);
 		restore_flags(flags);

@@ -658,11 +657,11 @@ static int pcxe_write(struct tty_struct 
 		remain = tail - head - 1;
 		stlen = remain;
 	}
-	count = MIN(remain, count);
+	count = min(remain, count);
 
 	txwinon(ch);
 	while (count > 0) {
-		stlen = MIN(count, stlen);
+		stlen = min(count, stlen);
 		memcpy(ch->txptr + head, buf, stlen);
 		buf += stlen;
 		count -= stlen;