git: 90f05f684077 - main - camcontrol: Zone fix two warnings

The branch main has been updated by imp:

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

commit 90f05f68407735531108b45eb105f8088bbaa1a5
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-06-19 20:51:07 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-06-19 20:51:07 +0000

    camcontrol: Zone fix two warnings
    
    Remove a set but never used variable, and use the protocol variable for
    its intended purpose.
    
    Sponsored by:           Netflix
    Reviewed by:            mav
    Differential Revision:  https://reviews.freebsd.org/D40528
---
 sbin/camcontrol/zone.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sbin/camcontrol/zone.c b/sbin/camcontrol/zone.c
index 3f7dfcec4f35..fed94cd967e1 100644
--- a/sbin/camcontrol/zone.c
+++ b/sbin/camcontrol/zone.c
@@ -138,7 +138,6 @@ zone_rz_print(uint8_t *data_ptr, uint32_t valid_len, int ata_format,
 	struct scsi_report_zones_desc *desc = NULL;
 	uint32_t hdr_len, len;
 	uint64_t max_lba, next_lba = 0;
-	int more_data = 0;
 	zone_print_status status = ZONE_PRINT_OK;
 	char tmpstr[80];
 	int field_widths[ZONE_NUM_FIELDS];
@@ -168,7 +167,6 @@ zone_rz_print(uint8_t *data_ptr, uint32_t valid_len, int ata_format,
 	}
 
 	if (hdr_len > (valid_len + sizeof(*hdr))) {
-		more_data = 1;
 		status = ZONE_PRINT_MORE_DATA;
 	}
 
@@ -592,7 +590,7 @@ restart_report:
 			    /*retry_count*/ retry_count,
 			    /*flags*/ CAM_DIR_NONE | CAM_DEV_QFRZDIS,
 			    /*tag_action*/ task_attr,
-			    /*protocol*/ AP_PROTO_NON_DATA,
+			    /*protocol*/ protocol,
 			    /*ata_flags*/ AP_FLAG_BYT_BLOK_BYTES |
 					  AP_FLAG_TLEN_NO_DATA,
 			    /*features*/ features,