diff options
author | alfred <alfred@FreeBSD.org> | 2003-02-02 13:17:30 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2003-02-02 13:17:30 +0000 |
commit | b5c0015ac9dfb47f49151ad199edb7f9f9665493 (patch) | |
tree | 373b34ef1d7f8eabfea9cac896b9dfe2b58a9879 /sys/dev | |
parent | 81ccce55b8025295556c35e83be8657c6f4659ab (diff) | |
download | FreeBSD-src-b5c0015ac9dfb47f49151ad199edb7f9f9665493.zip FreeBSD-src-b5c0015ac9dfb47f49151ad199edb7f9f9665493.tar.gz |
Consolidate MIN/MAX macros into one place (param.h).
Submitted by: Hiten Pandya <hiten@unixdaemons.com>
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/advansys/advlib.c | 2 | ||||
-rw-r--r-- | sys/dev/advansys/adwcam.c | 2 | ||||
-rw-r--r-- | sys/dev/aha/aha.c | 4 | ||||
-rw-r--r-- | sys/dev/ahb/ahb.c | 2 | ||||
-rw-r--r-- | sys/dev/buslogic/bt.c | 4 | ||||
-rw-r--r-- | sys/dev/sound/pci/cs4281.c | 3 | ||||
-rw-r--r-- | sys/dev/sym/sym_hipd.c | 7 |
7 files changed, 0 insertions, 24 deletions
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c index 7d3ec52..d8a35ab 100644 --- a/sys/dev/advansys/advlib.c +++ b/sys/dev/advansys/advlib.c @@ -1170,8 +1170,6 @@ adv_period_offset_to_sdtr(struct adv_softc *adv, u_int *period, period = &dummy_period; } -#define MIN(a,b) (((a) < (b)) ? (a) : (b)) - *offset = MIN(ADV_SYN_MAX_OFFSET, *offset); if (*period != 0 && *offset != 0) { for (i = 0; i < adv->sdtr_period_tbl_size; i++) { diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c index 91d2c7d..5007413 100644 --- a/sys/dev/advansys/adwcam.c +++ b/sys/dev/advansys/adwcam.c @@ -72,8 +72,6 @@ #define ccb_acb_ptr spriv_ptr0 #define ccb_adw_ptr spriv_ptr1 -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) - u_long adw_unit; static __inline cam_status adwccbstatus(union ccb*); diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c index b4dc58b..4ba7cea 100644 --- a/sys/dev/aha/aha.c +++ b/sys/dev/aha/aha.c @@ -84,10 +84,6 @@ */ #define PROBABLY_NEW_BOARD(REV) (REV > 0x43 && REV < 0x56) -#ifndef MAX -#define MAX(a, b) ((a) > (b) ? (a) : (b)) -#endif - /* MailBox Management functions */ static __inline void ahanextinbox(struct aha_softc *aha); static __inline void ahanextoutbox(struct aha_softc *aha); diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c index 740d626..ec5d138 100644 --- a/sys/dev/ahb/ahb.c +++ b/sys/dev/ahb/ahb.c @@ -55,8 +55,6 @@ #define ccb_ecb_ptr spriv_ptr0 #define ccb_ahb_ptr spriv_ptr1 -#define MIN(a, b) ((a) < (b) ? (a) : (b)) - #define ahb_inb(ahb, port) \ bus_space_read_1((ahb)->tag, (ahb)->bsh, port) diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c index 7bb3010..b7bc725 100644 --- a/sys/dev/buslogic/bt.c +++ b/sys/dev/buslogic/bt.c @@ -72,10 +72,6 @@ #include <dev/buslogic/btreg.h> -#ifndef MAX -#define MAX(a, b) ((a) > (b) ? (a) : (b)) -#endif - /* MailBox Management functions */ static __inline void btnextinbox(struct bt_softc *bt); static __inline void btnextoutbox(struct bt_softc *bt); diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index e34a162..6018ec2 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -50,9 +50,6 @@ SND_DECLARE_FILE("$FreeBSD$"); /* Misc */ -#define MIN(x,y) (x) < (y) ? (x) : (y) -#define MAX(x,y) (x) > (y) ? (x) : (y) - #define inline __inline #ifndef DEB diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c index 689ce89..fc52a6b 100644 --- a/sys/dev/sym/sym_hipd.c +++ b/sys/dev/sym/sym_hipd.c @@ -398,13 +398,6 @@ static __inline struct sym_quehead *sym_remque_tail(struct sym_quehead *head) #define MAX_QUEUE SYM_CONF_MAX_QUEUE /* - * These ones should have been already defined. - */ -#ifndef MIN -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) -#endif - -/* * Active debugging tags and verbosity. */ #define DEBUG_ALLOC (0x0001) |