diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index c0a13446c9c5..84a0101b796a 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -2566,12 +2566,11 @@ atahpa(struct cam_device *device, int retry_count, int timeout,
 	struct ata_params *ident_buf;
 	struct ccb_getdev cgd;
 	struct ata_set_max_pwd pwd;
-	int error, confirm, quiet, c, action, actions, setpwd, persist;
+	int error, confirm, quiet, c, action, actions, persist;
 	int security, is48bit, pwdsize;
 	u_int64_t hpasize, maxsize;
 
 	actions = 0;
-	setpwd = 0;
 	confirm = 0;
 	quiet = 0;
 	maxsize = 0;
diff --git a/sbin/camcontrol/persist.c b/sbin/camcontrol/persist.c
index bcc1073d2c05..c7e16c714f6e 100644
--- a/sbin/camcontrol/persist.c
+++ b/sbin/camcontrol/persist.c
@@ -432,7 +432,7 @@ scsipersist(struct cam_device *device, int argc, char **argv, char *combinedopt,
 	uint32_t res_len = 0;
 	unsigned long rel_tgt_port = 0;
 	uint8_t *res_buf = NULL;
-	int scope = SPR_LU_SCOPE, res_type = 0, key_set = 0, sa_key_set = 0;
+	int scope = SPR_LU_SCOPE, res_type = 0;
 	struct persist_transport_id *id, *id2;
 	STAILQ_HEAD(, persist_transport_id) transport_id_list;
 	uint64_t key = 0, sa_key = 0;
@@ -510,10 +510,8 @@ scsipersist(struct cam_device *device, int argc, char **argv, char *combinedopt,
 			}
 			if (c == 'k') {
 				key = tmpval;
-				key_set = 1;
 			} else {
 				sa_key = tmpval;
-				sa_key_set = 1;
 			}
 			break;
 		}