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

Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 854d16a39f210fda8c705c1bfaeb05e734b7312d..3f06a7ace867e2e442afa2b8aa73e504d4f491ce 100644 (file)
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -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 @@ static int pc_write(struct tty_struct * tty, int from_user,
                        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 */
 
@@ -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.
        ---------------------------------------------------------------------- */
 
-       bytesAvailable = MIN(remain, bytesAvailable);
+       bytesAvailable = min(remain, bytesAvailable);
 
        txwinon(ch);
        while (bytesAvailable > 0) 
@@ -923,7 +922,7 @@ static int pc_write(struct tty_struct * tty, int from_user,
                        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;