Commit 20d04774 authored by Andy Fleming's avatar Andy Fleming Committed by Wolfgang Denk

Consolidate MAX/MIN definitions

There were several, now there is one (two if you count the lower-case
versions).
Signed-off-by: default avatarAndy Fleming <afleming@freescale.com>
parent 298e476c
......@@ -46,8 +46,6 @@
# define DFC_DEBUG3(fmt, args...)
#endif
#define MIN(x, y) ((x < y) ? x : y)
/* These really don't belong here, as they are specific to the NAND Model */
static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
......
......@@ -46,8 +46,6 @@
# define DFC_DEBUG3(fmt, args...)
#endif
#define MIN(x, y) ((x < y) ? x : y)
/* These really don't belong here, as they are specific to the NAND Model */
static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
......
......@@ -13,10 +13,6 @@
DECLARE_GLOBAL_DATA_PTR;
#ifndef MAX
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
extern void show_regs __P ((struct pt_regs *));
extern int run_command __P ((const char *, int));
extern char console_buffer[];
......
......@@ -23,10 +23,6 @@
DECLARE_GLOBAL_DATA_PTR;
#endif
#ifndef MAX
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
int valid_elf_image (unsigned long addr);
unsigned long load_elf_image (unsigned long addr);
......
......@@ -193,8 +193,6 @@ extern int overflowEvent;
#define LEFT (-1)
/* macros */
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define IX_ETH_DB_CHECK_PORT_EXISTS(portID) \
{ \
if ((portID) >= IX_ETH_DB_NUMBER_OF_PORTS) \
......
......@@ -177,6 +177,9 @@ typedef void (interrupt_handler_t)(void *);
({ typeof (X) __x = (X), __y = (Y); \
(__x > __y) ? __x : __y; })
#define MIN(x, y) min(x, y)
#define MAX(x, y) max(x, y)
/**
* container_of - cast a member of a structure out to the containing structure
......
......@@ -126,14 +126,6 @@
})
#endif
#ifndef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
#ifndef MAX
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
/*
* Structure member address manipulation macros.
* These are used by client code (code using the urb_link routines), since
......
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