diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-05-17 23:57:52 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-05-17 23:57:52 +0000 |
| commit | 7a03e9bec2e1efff56688b1d74cadf721f7ae352 (patch) | |
| tree | 927e06c733f6d5380e35c3e59997faf2c1816b6f /sys/scsi/sd.c | |
| parent | 62217bbd5d9a3f247fa57fc7b5d233289251bcad (diff) | |
Elminate SCSIRET_* synonyms for EJUSTRETURN and ERESTART by using
EJUSTRETURN and ERESTART instead. Delete unused SCSIRET_RETRY define.
From NetBSD.
ok marco@
Diffstat (limited to 'sys/scsi/sd.c')
| -rw-r--r-- | sys/scsi/sd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 84ab20eca02..f55fa734777 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.68 2004/05/09 04:01:59 krw Exp $ */ +/* $OpenBSD: sd.c,v 1.69 2004/05/17 23:57:51 krw Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -1099,7 +1099,7 @@ sd_interpret_sense(xs) struct scsi_link *sc_link = xs->sc_link; struct scsi_sense_data *sense = &xs->sense; struct sd_softc *sd = sc_link->device_softc; - int retval = SCSIRET_CONTINUE; + int retval = EJUSTRETURN; /* * If the device is not open yet, let the generic code handle it. @@ -1126,7 +1126,7 @@ sd_interpret_sense(xs) * I really need a sdrestart function I can call here. */ delay(1000000 * 5); /* 5 seconds */ - retval = SCSIRET_RETRY; + retval = ERESTART; } else if (sense->add_sense_code_qual == 0x2) { if (sd->sc_link->flags & SDEV_REMOVABLE) { printf( @@ -1144,7 +1144,7 @@ sd_interpret_sense(xs) sd->sc_dev.dv_xname, retval); retval = EIO; } else { - retval = SCSIRET_RETRY; + retval = ERESTART; } } } |