s390: minmax-removal arch/s390/kernel/debug.c
PATCH 1/1 s390: minmax-removal arch/s390/kernel/debug.c
[PATCH] s390: minmax-removal arch/s390/kernel/debug.c
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 Martin Schwidefsky <[email protected]>
diffstat:
arch/s390/kernel/debug.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-)
arch/s390/kernel/debug.c +6 -7
@@ -24,7 +24,6 @@#include <asm/debug.h> -#define MIN (a,b) (((a)<(b))?(a):(b))#define DEBUG_PROLOG_ENTRY -1/* typedefs */
@@ -435,7 +434,7 @@while (count < len){ size =debug_format_entry (p_info); - size =MIN ((len - count), (size - entry_offset)); + size =min ((len - count), (size - entry_offset));if (size){ if (copy_to_user(user_buf + count,
@@ -723,7 +722,7 @@spin_lock_irqsave (&id->lock, flags); active =get_active_entry (id);memset (DEBUG_DATA (active),0 , id->buf_size); -memcpy (DEBUG_DATA (active), buf,MIN (len, id->buf_size)); +memcpy (DEBUG_DATA (active), buf,min (len, id->buf_size));debug_finish_entry (id, active, level,0 );spin_unlock_irqrestore (&id->lock, flags);
@@ -744,7 +743,7 @@spin_lock_irqsave (&id->lock, flags); active =get_active_entry (id);memset (DEBUG_DATA (active),0 , id->buf_size); -memcpy (DEBUG_DATA (active), buf,MIN (len, id->buf_size)); +memcpy (DEBUG_DATA (active), buf,min (len, id->buf_size));debug_finish_entry (id, active, level,1 );spin_unlock_irqrestore (&id->lock, flags);
@@ -789,7 +788,7 @@ curr_event=(debug_sprintf_entry_t *)DEBUG_DATA (active);va_start (ap,string); curr_event->string=string; -for (idx=0 ;idx<MIN (numargs,((id->buf_size /sizeof (long ))-1 ));idx++) +for (idx=0 ;idx<min (numargs,(int )(id->buf_size /sizeof (long ))-1 );idx++) curr_event->args[idx]=va_arg (ap,long);va_end (ap);debug_finish_entry (id, active, level,0 );
@@ -821,7 +820,7 @@ curr_event=(debug_sprintf_entry_t *)DEBUG_DATA (active);va_start (ap,string); curr_event->string=string; -for (idx=0 ;idx<MIN (numargs,((id->buf_size /sizeof (long ))-1 ));idx++) +for (idx=0 ;idx<min (numargs,(int )(id->buf_size /sizeof (long ))-1 );idx++) curr_event->args[idx]=va_arg (ap,long);va_end (ap);debug_finish_entry (id, active, level,1 );
@@ -1157,7 +1156,7 @@ }/* number of arguments used for sprintf (without the format string) */ - num_used_args =MIN (DEBUG_SPRINTF_MAX_ARGS , (num_longs -1 )); + num_used_args =min (DEBUG_SPRINTF_MAX_ARGS , (num_longs -1 ));memset (index,0 ,DEBUG_SPRINTF_MAX_ARGS *sizeof (int ));