Commit 7365d226 authored by Maximilian Attems's avatar Maximilian Attems Committed by Linus Torvalds

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

Signed-off-by: default avatarMaximilian Attems <janitor@sternwelten.at>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4e720e36
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,6 @@
#define DIGIINFOMAJOR 35 /* For Digi specific ioctl */ #define DIGIINFOMAJOR 35 /* For Digi specific ioctl */
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAXCARDS 7 #define MAXCARDS 7
#define epcaassert(x, msg) if (!(x)) epca_error(__LINE__, msg) #define epcaassert(x, msg) if (!(x)) epca_error(__LINE__, msg)
...@@ -826,7 +825,7 @@ static int pc_write(struct tty_struct * tty, int from_user, ...@@ -826,7 +825,7 @@ static int pc_write(struct tty_struct * tty, int from_user,
bytesAvailable will then take on this newly calculated value. 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 */ /* First we read the data in from the file system into a temp buffer */
...@@ -912,7 +911,7 @@ static int pc_write(struct tty_struct * tty, int from_user, ...@@ -912,7 +911,7 @@ static int pc_write(struct tty_struct * tty, int from_user,
space; reduce the amount of data to fit the space. space; reduce the amount of data to fit the space.
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
bytesAvailable = MIN(remain, bytesAvailable); bytesAvailable = min(remain, bytesAvailable);
txwinon(ch); txwinon(ch);
while (bytesAvailable > 0) while (bytesAvailable > 0)
...@@ -923,7 +922,7 @@ static int pc_write(struct tty_struct * tty, int from_user, ...@@ -923,7 +922,7 @@ static int pc_write(struct tty_struct * tty, int from_user,
data copy fills to the end of card buffer. data copy fills to the end of card buffer.
------------------------------------------------------------------- */ ------------------------------------------------------------------- */
dataLen = MIN(bytesAvailable, dataLen); dataLen = min(bytesAvailable, dataLen);
memcpy(ch->txptr + head, buf, dataLen); memcpy(ch->txptr + head, buf, dataLen);
buf += dataLen; buf += dataLen;
head += dataLen; head += dataLen;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment