summaryrefslogtreecommitdiffstats
path: root/sys/scsi/scsi_base.c
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2019-11-22 15:34:29 +0000
committerkrw <krw@openbsd.org>2019-11-22 15:34:29 +0000
commit64e2b1d674c763508d45c7dcb85a0a80efadd8c9 (patch)
treefeeb9fc0765d65deaa8c2cd9c063abfd48c0fd21 /sys/scsi/scsi_base.c
parentDNS Proposals are treated as replacements in unwind now. (diff)
downloadwireguard-openbsd-64e2b1d674c763508d45c7dcb85a0a80efadd8c9.tar.xz
wireguard-openbsd-64e2b1d674c763508d45c7dcb85a0a80efadd8c9.zip
Be consistent and always use CLR() to clear flags.
Diffstat (limited to 'sys/scsi/scsi_base.c')
-rw-r--r--sys/scsi/scsi_base.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index fcce9f680e7..437dedf3745 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_base.c,v 1.240 2019/11/21 23:22:14 krw Exp $ */
+/* $OpenBSD: scsi_base.c,v 1.241 2019/11/22 15:34:29 krw Exp $ */
/* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */
/*
@@ -1519,7 +1519,7 @@ scsi_interpret_sense(struct scsi_xfer *xs)
case SENSE_NOMEDIUM_TOPEN:
case SENSE_NOMEDIUM_LOADABLE:
case SENSE_NOMEDIUM_AUXMEM:
- link->flags &= ~SDEV_MEDIA_LOADED;
+ CLR(link->flags, SDEV_MEDIA_LOADED);
error = ENOMEDIUM;
break;
default:
@@ -1534,7 +1534,7 @@ scsi_interpret_sense(struct scsi_xfer *xs)
case SENSE_NOMEDIUM_TOPEN:
case SENSE_NOMEDIUM_LOADABLE:
case SENSE_NOMEDIUM_AUXMEM:
- link->flags &= ~SDEV_MEDIA_LOADED;
+ CLR(link->flags, SDEV_MEDIA_LOADED);
error = ENOMEDIUM;
break;
case SENSE_BAD_MEDIUM:
@@ -1573,7 +1573,7 @@ scsi_interpret_sense(struct scsi_xfer *xs)
break;
}
if ((link->flags & SDEV_REMOVABLE) != 0)
- link->flags &= ~SDEV_MEDIA_LOADED;
+ CLR(link->flags, SDEV_MEDIA_LOADED);
if (ISSET(xs->flags, SCSI_IGNORE_MEDIA_CHANGE) ||
/* XXX Should reupload any transient state. */
(link->flags & SDEV_REMOVABLE) == 0) {