diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-08-19 22:46:20 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-08-19 22:46:20 +0000 |
| commit | 17a9a1d25d0ec85876e911c41308bb153881eeb8 (patch) | |
| tree | 2fb2508b31221c2e3c6fddedeaccbebbb3a47b7a /sys | |
| parent | 28a520201466f39fe6e567fcf50a54757b655989 (diff) | |
Replace last 2 'blah & (flag1 | flag2) == 0' with !ISSET(blah, (flag1 | flag2)).
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/scsi/scsi_base.c | 4 | ||||
| -rw-r--r-- | sys/scsi/scsi_ioctl.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index 18c1d45285b..54484cf9b63 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi_base.c,v 1.269 2020/08/11 15:23:57 krw Exp $ */ +/* $OpenBSD: scsi_base.c,v 1.270 2020/08/19 22:46:19 krw Exp $ */ /* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */ /* @@ -1302,7 +1302,7 @@ scsi_do_mode_sense(struct scsi_link *link, int pg_code, * non-ATAPI, non-USB devices that don't support SCSI-2 commands * (i.e. MODE SENSE (10)) are done. */ - if ((link->flags & (SDEV_ATAPI | SDEV_UMASS)) == 0 && + if (!ISSET(link->flags, (SDEV_ATAPI | SDEV_UMASS)) && SID_ANSII_REV(&link->inqdata) < SCSI_REV_2) return error; diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c index ae2365a8643..01c0d70e8d7 100644 --- a/sys/scsi/scsi_ioctl.c +++ b/sys/scsi/scsi_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi_ioctl.c,v 1.65 2020/08/11 15:23:57 krw Exp $ */ +/* $OpenBSD: scsi_ioctl.c,v 1.66 2020/08/19 22:46:19 krw Exp $ */ /* $NetBSD: scsi_ioctl.c,v 1.23 1996/10/12 23:23:17 christos Exp $ */ /* @@ -300,7 +300,7 @@ scsi_do_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag) case SCIOCIDENTIFY: { struct scsi_addr *sca = (struct scsi_addr *)addr; - if ((link->flags & (SDEV_ATAPI | SDEV_UMASS)) == 0) + if (!ISSET(link->flags, (SDEV_ATAPI | SDEV_UMASS))) /* A 'real' SCSI target. */ sca->type = TYPE_SCSI; else |