Skip to contentSkip to conversation

minmax-removal arch/ia64/hp/sim/simserial.c

PATCH In review [email protected] 2 participants 2 messages Sep 1, 2004 – Sep 8, 2004

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 2/2 minmax-removal arch/ia64/hp/sim/simserial.c

Patch (against 2.6.8.1) removes unnecessary min/max macros and changes calls to use kernel.h macros instead.

Since I dont have the hardware those patches are not tested.

Best regards
Veeck

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

---

 linux-2.6.9-rc1-bk7-max/arch/ia64/hp/sim/simserial.c |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)
arch/ia64/hp/sim/simserial.c renamed from arch/ia64/hp/sim/simserial.c~min-max-arch_ia64_hp_sim_simserial +1 -5
diff -puN arch/ia64/hp/sim/simserial.c~min-max-arch_ia64_hp_sim_simserial arch/ia64/hp/sim/simserial.c
@@ -50,10 +50,6 @@
 #define _INLINE_ inline
 #endif
 
-#ifndef MIN
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
-#endif
-
 #define IRQ_T(info) ((info->flags & ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT)
 
 #define SSC_GETCHAR	21

@@ -275,7 +271,7 @@ static _INLINE_ void transmit_chars(stru
 	 * Then from the beginning of the buffer until necessary
 	 */
 
-	count = MIN(CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE),
+	count = min(CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE),
 		    SERIAL_XMIT_SIZE - info->xmit.tail);
 	console->write(console, info->xmit.buf+info->xmit.tail, count);

_

#1 lore raw

Tony,

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line · On Wed, 01 Sep 2004 23:24:57 +0200, [email protected] said:

Janitor> Patch (against 2.6.8.1) removes unnecessary min/max macros Janitor> and changes calls to use kernel.h macros instead.

I reviewed and tested this patch and approve of it. Please apply.

Thanks,

	--david

--
ia64: minmax-removal in arch/ia64/hp/sim/simserial.c

Patch (against 2.6.8.1) removes unnecessary min/max macros and changes calls to use kernel.h macros instead.

Signed-off-by Michael Veeck <[email protected]>
Signed-off-by Maximilian Attems <[email protected]>
Signed-off-by David Mosberger-Tang <[email protected]>

---

 linux-2.6.9-rc1-bk7-max/arch/ia64/hp/sim/simserial.c |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)
arch/ia64/hp/sim/simserial.c renamed from arch/ia64/hp/sim/simserial.c~min-max-arch_ia64_hp_sim_simserial +1 -5
diff -puN arch/ia64/hp/sim/simserial.c~min-max-arch_ia64_hp_sim_simserial arch/ia64/hp/sim/simserial.c
@@ -50,10 +50,6 @@
 #define _INLINE_ inline
 #endif
 
-#ifndef MIN
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
-#endif
-
 #define IRQ_T(info) ((info->flags & ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT)
 
 #define SSC_GETCHAR	21

@@ -275,7 +271,7 @@ static _INLINE_ void transmit_chars(stru
 	 * Then from the beginning of the buffer until necessary
 	 */
 
-	count = MIN(CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE),
+	count = min(CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE),
 		    SERIAL_XMIT_SIZE - info->xmit.tail);
 	console->write(console, info->xmit.buf+info->xmit.tail, count);

_