diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index e8437ff55..b55fb9bcd 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -1110,11 +1110,11 @@ static int vdisk_get_file_size(const char *filename, bool blockio,
 		goto out_close;
 	}
 
-	if (S_ISREG(inode->i_mode))
-		/* Nothing to do */;
-	else if (S_ISBLK(inode->i_mode))
+	if (S_ISREG(inode->i_mode)) {
+		/* Nothing to do */
+	} else if (S_ISBLK(inode->i_mode)) {
 		inode = inode->i_bdev->bd_inode;
-	else {
+	} else {
 		res = -EINVAL;
 		goto out_close;
 	}
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 03ae0060f..dab85cedb 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -3349,7 +3349,7 @@ static int __scst_adjust_sg_get_tail(struct scst_cmd *cmd,
 			TRACE_DBG_FLAG(TRACE_SG_OP|TRACE_MEMORY|TRACE_DEBUG,
 				"cmd %p (tag %llu), sg %p, adjust_len %d, i %d, "
 				"j %d, sg[j].length %d, offs %d",
-				cmd, (long long unsigned int)cmd->tag,
+				cmd, (unsigned long long)cmd->tag,
 				sg, adjust_len, i, j, sg[j].length, offs);
 
 			if (offs == sg[j].length) {
@@ -14397,11 +14397,11 @@ int scst_copy_file(const char *src, const char *dest)
 
 	inode = file_inode(file_src);
 
-	if (S_ISREG(inode->i_mode))
-		/* Nothing to do */;
-	else if (S_ISBLK(inode->i_mode))
+	if (S_ISREG(inode->i_mode)) {
+		/* Nothing to do */
+	} else if (S_ISBLK(inode->i_mode)) {
 		inode = inode->i_bdev->bd_inode;
-	else {
+	} else {
 		PRINT_ERROR("Invalid file mode 0x%x", inode->i_mode);
 		res = -EINVAL;
 		set_fs(old_fs);
@@ -14596,11 +14596,11 @@ static int __scst_read_file_transactional(const char *file_name,
 
 	inode = file_inode(file);
 
-	if (S_ISREG(inode->i_mode))
-		/* Nothing to do */;
-	else if (S_ISBLK(inode->i_mode))
+	if (S_ISREG(inode->i_mode)) {
+		/* Nothing to do */
+	} else if (S_ISBLK(inode->i_mode)) {
 		inode = inode->i_bdev->bd_inode;
-	else {
+	} else {
 		PRINT_ERROR("Invalid file mode 0x%x", inode->i_mode);
 		res = -EINVAL;
 		goto out_close;
diff --git a/scst/src/scst_pres.c b/scst/src/scst_pres.c
index 8d48ab86f..8ce467d6e 100644
--- a/scst/src/scst_pres.c
+++ b/scst/src/scst_pres.c
@@ -694,11 +694,11 @@ static int scst_pr_do_load_device_file(struct scst_device *dev,
 
 	inode = file_inode(file);
 
-	if (S_ISREG(inode->i_mode))
-		/* Nothing to do */;
-	else if (S_ISBLK(inode->i_mode))
+	if (S_ISREG(inode->i_mode)) {
+		/* Nothing to do */
+	} else if (S_ISBLK(inode->i_mode)) {
 		inode = inode->i_bdev->bd_inode;
-	else {
+	} else {
 		PRINT_ERROR("Invalid file mode 0x%x", inode->i_mode);
 		goto out_close;
 	}
diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c
index b9453278d..b6198f78b 100644
--- a/scst/src/scst_targ.c
+++ b/scst/src/scst_targ.c
@@ -3734,9 +3734,9 @@ static int scst_exec_check_blocking(struct scst_cmd **active_cmd)
 		cmd->state = SCST_CMD_STATE_LOCAL_EXEC;
 
 		rc = scst_do_local_exec(cmd);
-		if (likely(rc == SCST_EXEC_NOT_COMPLETED))
-			/* Nothing to do */;
-		else {
+		if (likely(rc == SCST_EXEC_NOT_COMPLETED)) {
+			/* Nothing to do */
+		} else {
 			sBUG_ON(rc != SCST_EXEC_COMPLETED);
 			goto done;
 		}