diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2007-02-23 23:06:10 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2007-02-23 23:06:10 +0000 |
| commit | 6e50e38fcce8c444397d635c689c842a5af05dae (patch) | |
| tree | 5a5982bfc22dc52ef26abd8c64d36de520251b0c /sys/dev/fdc | |
| parent | 4a50bbc03e3c313dabee24c165cbc8c93bfa4c61 (diff) | |
| download | src-6e50e38fcce8c444397d635c689c842a5af05dae.tar.gz src-6e50e38fcce8c444397d635c689c842a5af05dae.zip | |
Use tsleep() rather than msleep() with a NULL mtx parameter.
Notes
Notes:
svn path=/head/; revision=166934
Diffstat (limited to 'sys/dev/fdc')
| -rw-r--r-- | sys/dev/fdc/fdc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index c93695128b11..7970232b7734 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -790,7 +790,7 @@ fdc_worker(struct fdc_data *fdc) if (fdc->flags & FDC_NEEDS_RESET) { fdc->flags &= ~FDC_NEEDS_RESET; fdc_reset(fdc); - msleep(fdc, NULL, PRIBIO, "fdcrst", hz); + tsleep(fdc, PRIBIO, "fdcrst", hz); /* Discard results */ for (i = 0; i < 4; i++) fdc_sense_int(fdc, &st0, &cyl); @@ -855,7 +855,7 @@ fdc_worker(struct fdc_data *fdc) retry_line = __LINE__; if (fdc_cmd(fdc, 2, NE7CMD_RECAL, fd->fdsu, 0)) return (1); - msleep(fdc, NULL, PRIBIO, "fdrecal", hz); + tsleep(fdc, PRIBIO, "fdrecal", hz); retry_line = __LINE__; if (fdc_sense_int(fdc, &st0, &cyl) == FD_NOT_VALID) return (1); /* XXX */ @@ -867,7 +867,7 @@ fdc_worker(struct fdc_data *fdc) retry_line = __LINE__; if (fdc_cmd(fdc, 3, NE7CMD_SEEK, fd->fdsu, 1, 0)) return (1); - msleep(fdc, NULL, PRIBIO, "fdseek", hz); + tsleep(fdc, PRIBIO, "fdseek", hz); retry_line = __LINE__; if (fdc_sense_int(fdc, &st0, &cyl) == FD_NOT_VALID) return (1); /* XXX */ @@ -956,7 +956,7 @@ fdc_worker(struct fdc_data *fdc) retry_line = __LINE__; if (fdc_cmd(fdc, 2, NE7CMD_RECAL, fd->fdsu, 0)) return (1); - msleep(fdc, NULL, PRIBIO, "fdrecal", hz); + tsleep(fdc, PRIBIO, "fdrecal", hz); retry_line = __LINE__; if (fdc_sense_int(fdc, &st0, &cyl) == FD_NOT_VALID) return (1); /* XXX */ @@ -967,7 +967,7 @@ fdc_worker(struct fdc_data *fdc) fd->track = 0; /* let the heads settle */ if (settle) - msleep(fdc->fd, NULL, PRIBIO, "fdhdstl", settle); + tsleep(fdc->fd, PRIBIO, "fdhdstl", settle); } /* @@ -983,7 +983,7 @@ fdc_worker(struct fdc_data *fdc) retry_line = __LINE__; if (fdc_cmd(fdc, 3, NE7CMD_SEEK, fd->fdsu, descyl, 0)) return (1); - msleep(fdc, NULL, PRIBIO, "fdseek", hz); + tsleep(fdc, PRIBIO, "fdseek", hz); retry_line = __LINE__; if (fdc_sense_int(fdc, &st0, &cyl) == FD_NOT_VALID) return (1); /* XXX */ @@ -994,7 +994,7 @@ fdc_worker(struct fdc_data *fdc) } /* let the heads settle */ if (settle) - msleep(fdc->fd, NULL, PRIBIO, "fdhdstl", settle); + tsleep(fdc->fd, PRIBIO, "fdhdstl", settle); } fd->track = cylinder; @@ -1080,7 +1080,7 @@ fdc_worker(struct fdc_data *fdc) } /* Wait for interrupt */ - i = msleep(fdc, NULL, PRIBIO, "fddata", hz); + i = tsleep(fdc, PRIBIO, "fddata", hz); /* PIO if the read looks good */ if (i == 0 && (fdc->flags & FDC_NODMA) && (bp->bio_cmd & BIO_READ)) @@ -1279,7 +1279,7 @@ fdmisccmd(struct fd_data *fd, u_int cmd, void *data) fd_enqueue(fd, bp); do { - msleep(bp, NULL, PRIBIO, "fdwait", hz); + tsleep(bp, PRIBIO, "fdwait", hz); } while (!(bp->bio_flags & BIO_DONE)); error = bp->bio_error; |