diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2019-09-29 17:23:25 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2019-09-29 17:23:25 +0000 |
| commit | a2cc3b13afc4925f7d50b37edc848e96fde6c141 (patch) | |
| tree | 50f33176f603917090e9bb3fdb6c02cbb314c69c /sys | |
| parent | 68f65580bd5cf66749cda97f4bda52c56a054725 (diff) | |
Continue SCSIDEBUG cleanup by nuking pointles SC_DEBUGN() #define.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/scsi/scsi_debug.h | 8 | ||||
| -rw-r--r-- | sys/scsi/st.c | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/sys/scsi/scsi_debug.h b/sys/scsi/scsi_debug.h index a58e218b3ae..6d6a14e6e3e 100644 --- a/sys/scsi/scsi_debug.h +++ b/sys/scsi/scsi_debug.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi_debug.h,v 1.17 2019/09/29 15:47:29 krw Exp $ */ +/* $OpenBSD: scsi_debug.h,v 1.18 2019/09/29 17:23:24 krw Exp $ */ /* $NetBSD: scsi_debug.h,v 1.7 1996/10/12 23:23:16 christos Exp $ */ /* @@ -56,14 +56,8 @@ void scsi_show_flags(u_int16_t, const char **); printf Printstuff; \ } \ } while (0) -#define SC_DEBUGN(link,Level,Printstuff) do { \ - if ((link)->flags & (Level)) { \ - printf Printstuff; \ - } \ -} while (0) #else #define SC_DEBUG(A,B,C) -#define SC_DEBUGN(A,B,C) #endif /* SCSIDEBUG */ #endif /* _KERNEL */ diff --git a/sys/scsi/st.c b/sys/scsi/st.c index 677a32f7c20..4fa828cb6a0 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -1,4 +1,4 @@ -/* $OpenBSD: st.c,v 1.167 2019/09/29 15:47:29 krw Exp $ */ +/* $OpenBSD: st.c,v 1.168 2019/09/29 17:23:24 krw Exp $ */ /* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */ /* @@ -1368,15 +1368,14 @@ st_mode_sense(struct st_softc *st, int flags) st->media_density = density; SC_DEBUG(link, SDEV_DB3, - ("density code 0x%x, %d-byte blocks, write-%s, ", + ("density code 0x%x, %d-byte blocks, write-%s, %sbuffered\n", st->media_density, st->media_blksize, - ISSET(link->flags, SDEV_READONLY) ? "protected" : "enabled")); - SC_DEBUGN(link, SDEV_DB3, - ("%sbuffered\n", ISSET(dev_spec, SMH_DSP_BUFF_MODE) ? "" : "un")); + ISSET(link->flags, SDEV_READONLY) ? "protected" : "enabled", + ISSET(dev_spec, SMH_DSP_BUFF_MODE) ? "" : "un")); SET(link->flags, SDEV_MEDIA_LOADED); -done: + done: if (data) dma_free(data, sizeof(*data)); return error; |