drivers/char/mxser.c MIN/MAX removal

PATCH In review [email protected] 1 participant 1 message Sep 1, 2004

Subsystems (2)

Arm i.MX and Layerscape Char and misc drivers

lore

Share & tools

lore

[email protected]

author

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

PATCH 5/25 drivers/char/mxser.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/mxser.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

drivers/char/mxser.c renamed from drivers/char/mxser.c~min-max-char_mxser +3 -7

diff -puN drivers/char/mxser.c~min-max-char_mxser drivers/char/mxser.c
@@ -101,10 +101,6 @@
 
 #define IRQ_T(info) ((info->flags & ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT)
 
-#ifndef MIN
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
-#endif
-
 /*
  *    Define the Moxa PCI vendor and device IDs.
  */

@@ -849,7 +845,7 @@ static int mxser_write(struct tty_struct
 	if (from_user) {
 		down(&mxvar_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;

@@ -862,7 +858,7 @@ static int mxser_write(struct tty_struct
 			}
 
 			cli();
-			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, mxvar_tmp_buf, c);
 			info->xmit_head = (info->xmit_head + c) & (SERIAL_XMIT_SIZE - 1);

@@ -877,7 +873,7 @@ static int mxser_write(struct tty_struct
 	} else {
 		while (1) {
 			cli();
-			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) {
 				restore_flags(flags);