diff options
| author | Scott Long <scottl@FreeBSD.org> | 2020-10-13 14:10:49 +0000 |
|---|---|---|
| committer | Scott Long <scottl@FreeBSD.org> | 2020-10-13 14:10:49 +0000 |
| commit | 4bc604dcda3e3dad9f4fe6971d3a57fbf6d68f3f (patch) | |
| tree | 6961a56f31ef25ea10c531bf6b5ffc3160303106 | |
| parent | 52b83a06184cb7b1739d8c0238c97283c762c04b (diff) | |
Bring the request_descriptor union into harmony internally. No
functional change.
Notes
Notes:
svn path=/head/; revision=366668
| -rw-r--r-- | sys/dev/mpr/mpr.c | 6 | ||||
| -rw-r--r-- | sys/dev/mps/mps.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/mpr/mpr.c b/sys/dev/mpr/mpr.c index b9ca24933ef3..197016562219 100644 --- a/sys/dev/mpr/mpr.c +++ b/sys/dev/mpr/mpr.c @@ -129,13 +129,13 @@ static char mpt2_reset_magic[] = { 0x00, 0x0f, 0x04, 0x0b, 0x02, 0x07, 0x0d }; * Otherwise it will throw this error: * "aggregate value used where an integer was expected" */ -typedef union _reply_descriptor { +typedef union { u64 word; struct { u32 low; u32 high; } u; -} reply_descriptor, request_descriptor; +} request_descriptor_t; /* Rate limit chain-fail messages to 1 per minute */ static struct timeval mpr_chainfail_interval = { 60, 0 }; @@ -1121,7 +1121,7 @@ mpr_request_sync(struct mpr_softc *sc, void *req, MPI2_DEFAULT_REPLY *reply, static void mpr_enqueue_request(struct mpr_softc *sc, struct mpr_command *cm) { - request_descriptor rd; + request_descriptor_t rd; MPR_FUNCTRACE(sc); mpr_dprint(sc, MPR_TRACE, "SMID %u cm %p ccb %p\n", diff --git a/sys/dev/mps/mps.c b/sys/dev/mps/mps.c index e3db1e49118f..52d76a6c1924 100644 --- a/sys/dev/mps/mps.c +++ b/sys/dev/mps/mps.c @@ -128,13 +128,13 @@ static char mpt2_reset_magic[] = { 0x00, 0x0f, 0x04, 0x0b, 0x02, 0x07, 0x0d }; * "aggregate value used where an integer was expected" */ -typedef union _reply_descriptor { +typedef union { u64 word; struct { u32 low; u32 high; } u; -}reply_descriptor,address_descriptor; +} request_descriptor_t; /* Rate limit chain-fail messages to 1 per minute */ static struct timeval mps_chainfail_interval = { 60, 0 }; @@ -1098,7 +1098,7 @@ mps_request_sync(struct mps_softc *sc, void *req, MPI2_DEFAULT_REPLY *reply, static void mps_enqueue_request(struct mps_softc *sc, struct mps_command *cm) { - reply_descriptor rd; + request_descriptor_t rd; MPS_FUNCTRACE(sc); mps_dprint(sc, MPS_TRACE, "SMID %u cm %p ccb %p\n", cm->cm_desc.Default.SMID, cm, cm->cm_ccb); |