git: a74530d9e2db - main - cam/ctl: Migrate to modern uintXX_t from u_intXX_t

From: Warner Losh <imp_at_FreeBSD.org>
Date: Tue, 25 Jul 2023 04:26:31 UTC
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=a74530d9e2dbdae63eec79e6b0f238c10ef0345b

commit a74530d9e2dbdae63eec79e6b0f238c10ef0345b
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-07-25 03:17:41 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-07-25 03:32:56 +0000

    cam/ctl: Migrate to modern uintXX_t from u_intXX_t
    
    As per https://lists.freebsd.org/archives/freebsd-scsi/2023-July/000257.html
    move to the modern uintXX_t.
    
    MFC After:      3 days
    Sponsored by:   Netflix
---
 sys/cam/ctl/ctl.c      | 2 +-
 sys/cam/ctl/scsi_ctl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index a365d5726d93..7507c4c3f18a 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -8272,7 +8272,7 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 	struct ctl_softc *softc = CTL_SOFTC(ctsio);
 	struct ctl_lun *lun = CTL_LUN(ctsio);
 	int retval;
-	u_int32_t param_len;
+	uint32_t param_len;
 	struct scsi_per_res_out *cdb;
 	struct scsi_per_res_out_parms* param;
 	uint32_t residx;
diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c
index cd521e66ebe0..e7fd66c33580 100644
--- a/sys/cam/ctl/scsi_ctl.c
+++ b/sys/cam/ctl/scsi_ctl.c
@@ -669,7 +669,7 @@ ctlfecleanup(struct cam_periph *periph)
 static void
 ctlfedata(struct ctlfe_lun_softc *softc, union ctl_io *io,
     ccb_flags *flags, uint8_t **data_ptr, uint32_t *dxfer_len,
-    u_int16_t *sglist_cnt)
+    uint16_t *sglist_cnt)
 {
 	struct ctlfe_softc *bus_softc;
 	struct ctlfe_cmd_info *cmd_info;