summaryrefslogtreecommitdiffstats
path: root/sys/cam/scsi
diff options
context:
space:
mode:
Diffstat (limited to 'sys/cam/scsi')
-rw-r--r--sys/cam/scsi/scsi_cd.c4
-rw-r--r--sys/cam/scsi/scsi_pass.c4
-rw-r--r--sys/cam/scsi/scsi_targ_bh.c2
3 files changed, 0 insertions, 10 deletions
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index a187c79..ebfe241 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -172,10 +172,6 @@ static struct cd_quirk_entry cd_quirk_table[] =
}
};
-#ifndef MIN
-#define MIN(x,y) ((x<y) ? x : y)
-#endif
-
#define CD_CDEV_MAJOR 15
static d_open_t cdopen;
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index d22e621..13580a0 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -76,10 +76,6 @@ struct pass_softc {
dev_t dev;
};
-#ifndef MIN
-#define MIN(x,y) ((x<y) ? x : y)
-#endif
-
#define PASS_CDEV_MAJOR 31
static d_open_t passopen;
diff --git a/sys/cam/scsi/scsi_targ_bh.c b/sys/cam/scsi/scsi_targ_bh.c
index d01595e..60e68dd 100644
--- a/sys/cam/scsi/scsi_targ_bh.c
+++ b/sys/cam/scsi/scsi_targ_bh.c
@@ -69,8 +69,6 @@ typedef enum {
#define MAX_IMMEDIATE 16
#define MAX_BUF_SIZE 256 /* Max inquiry/sense/mode page transfer */
-#define MIN(a, b) ((a > b) ? b : a)
-
/* Offsets into our private CCB area for storing accept information */
#define ccb_type ppriv_field0
#define ccb_descr ppriv_ptr1
OpenPOWER on IntegriCloud