diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index 270b67222..27db23872 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -4891,7 +4891,7 @@ static enum compl_status_e fileio_exec_write(struct vdisk_cmd_params *p)
 	loff_t loff = p->loff;
 	mm_segment_t old_fs;
 	loff_t err = 0;
-	ssize_t length, full_len, saved_full_len;
+	ssize_t length, full_len;
 	uint8_t __user *address;
 	struct scst_vdisk_dev *virt_dev = cmd->dev->dh_priv;
 	struct file *fd = virt_dev->fd;
@@ -4947,7 +4947,6 @@ static enum compl_status_e fileio_exec_write(struct vdisk_cmd_params *p)
 			goto out_set_fs;
 		}
 
-		saved_full_len = full_len;
 		eiv = iv;
 		eiv_count = iv_count;
 restart:
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 8dbd0b2ea..afc3cc55d 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -9076,16 +9076,11 @@ static void scst_process_qerr(struct scst_cmd *cmd)
 int scst_process_check_condition(struct scst_cmd *cmd)
 {
 	int res;
-	struct scst_order_data *order_data;
-	struct scst_device *dev;
 
 	TRACE_ENTRY();
 
 	EXTRACHECKS_BUG_ON(test_bit(SCST_CMD_NO_RESP, &cmd->cmd_flags));
 
-	order_data = cmd->cur_order_data;
-	dev = cmd->dev;
-
 	TRACE_DBG("CHECK CONDITION for cmd %p (tgt_dev %p)", cmd, cmd->tgt_dev);
 
 	scst_process_qerr(cmd);
diff --git a/scst/src/scst_pres.c b/scst/src/scst_pres.c
index c20edd010..08dc6ddea 100644
--- a/scst/src/scst_pres.c
+++ b/scst/src/scst_pres.c
@@ -858,15 +858,16 @@ out:
 
 static void scst_pr_remove_device_files(struct scst_tgt_dev *tgt_dev)
 {
-	int res = 0;
 	struct scst_device *dev = tgt_dev->dev;
 
 	TRACE_ENTRY();
 
 	scst_assert_pr_mutex_held(dev);
 
-	res = dev->pr_file_name ? scst_remove_file(dev->pr_file_name) : -ENOENT;
-	res = dev->pr_file_name1 ? scst_remove_file(dev->pr_file_name1) : -ENOENT;
+	if (dev->pr_file_name)
+		scst_remove_file(dev->pr_file_name);
+	if (dev->pr_file_name1)
+		scst_remove_file(dev->pr_file_name1);
 
 	TRACE_EXIT();
 	return;