diff options
| author |   krw <krw@openbsd.org> | 2020-03-12 13:49:25 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-03-12 13:49:25 +0000 |
| commit | fe20f155dc26585636c7ae6583cd71dab13c750f (patch) | |
| tree | 0c14be5b6ccb0dc554d5b8199a518bb2b66e0a9a /sys/scsi/scsi_base.c | |
| parent | Tidy up the default mouse key bindings and: (diff) | |
| download | wireguard-openbsd-fe20f155dc26585636c7ae6583cd71dab13c750f.tar.xz wireguard-openbsd-fe20f155dc26585636c7ae6583cd71dab13c750f.zip | |
Eliminate 'len' parameter from scsi_mode_sense[_big](). It's
always sizeof(struct scsi_mode_sense_buf).
No functional change.
Diffstat (limited to 'sys/scsi/scsi_base.c')
| -rw-r--r-- | sys/scsi/scsi_base.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index a1f30b55660..504c9f8ff44 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi_base.c,v 1.262 2020/03/11 19:23:08 krw Exp $ */ +/* $OpenBSD: scsi_base.c,v 1.263 2020/03/12 13:49:25 krw Exp $ */ /* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */ /* @@ -90,9 +90,9 @@ void scsi_iopool_put(struct scsi_iopool *, void *); /* Various helper functions for scsi_do_mode_sense() */ int scsi_mode_sense(struct scsi_link *, int, - struct scsi_mode_header *, size_t, int); + struct scsi_mode_header *, int); int scsi_mode_sense_big(struct scsi_link *, int, - struct scsi_mode_header_big *, size_t, int); + struct scsi_mode_header_big *, int); void * scsi_mode_sense_page(struct scsi_mode_header *, int, int); void * scsi_mode_sense_big_page(struct scsi_mode_header_big *, @@ -1062,15 +1062,18 @@ scsi_start(struct scsi_link *link, int type, int flags) int scsi_mode_sense(struct scsi_link *link, int pg_code, - struct scsi_mode_header *data, size_t len, int flags) + struct scsi_mode_header *data, int flags) { struct scsi_mode_sense *cmd; struct scsi_xfer *xs; + size_t len; int error; #ifdef SCSIDEBUG size_t bytes; #endif /* SCSIDEBUG */ + len = sizeof(union scsi_mode_sense_buf); + xs = scsi_xs_get(link, flags | SCSI_DATA_IN); if (xs == NULL) return ENOMEM; @@ -1115,15 +1118,18 @@ scsi_mode_sense(struct scsi_link *link, int pg_code, int scsi_mode_sense_big(struct scsi_link *link, int pg_code, - struct scsi_mode_header_big *data, size_t len, int flags) + struct scsi_mode_header_big *data, int flags) { struct scsi_mode_sense_big *cmd; struct scsi_xfer *xs; + size_t len; int error; #ifdef SCSIDEBUG size_t bytes; #endif /* SCSIDEBUG */ + len = sizeof(union scsi_mode_sense_buf); + xs = scsi_xs_get(link, flags | SCSI_DATA_IN); if (xs == NULL) return ENOMEM; @@ -1273,8 +1279,7 @@ scsi_do_mode_sense(struct scsi_link *link, int pg_code, * data length to ensure that at least a header (3 additional * bytes) is returned. */ - error = scsi_mode_sense(link, pg_code, &buf->hdr, - sizeof(*buf), flags); + error = scsi_mode_sense(link, pg_code, &buf->hdr, flags); if (error == 0) { /* * Page data may be invalid (e.g. all zeros) but we @@ -1299,8 +1304,7 @@ scsi_do_mode_sense(struct scsi_link *link, int pg_code, /* * Try 10 byte mode sense request. */ - error = scsi_mode_sense_big(link, pg_code, &buf->hdr_big, - sizeof(*buf), flags); + error = scsi_mode_sense_big(link, pg_code, &buf->hdr_big, flags); if (error != 0) return error; if (_2btol(buf->hdr_big.data_length) < 6) |