diff --git a/iscsi-scst/kernel/digest.c b/iscsi-scst/kernel/digest.c
index 5b87519eb..463840ce0 100644
--- a/iscsi-scst/kernel/digest.c
+++ b/iscsi-scst/kernel/digest.c
@@ -39,12 +39,9 @@ void digest_alg_available(int *val)
 }
 
 /**
- * initialize support for digest calculation.
- *
- * digest_init -
+ * digest_init - initialize support for digest calculation.
  * @conn: ptr to connection to make use of digests
- *
- * @return: 0 on success, < 0 on error
+ * Returns: 0 on success, < 0 on error
  */
 int digest_init(struct iscsi_conn *conn)
 {
diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index 463fdb5c1..aa01fea1b 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -488,8 +488,10 @@ static int vdisk_blockio_flush(struct block_device *bdev, gfp_t gfp_mask,
 		res = blkdev_issue_flush(bdev, gfp_mask, NULL, BLKDEV_IFL_WAIT);
 #elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)
 		res = blkdev_issue_flush(bdev, gfp_mask, NULL);
-#else
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 12, 0)
 		res = blkdev_issue_flush(bdev, gfp_mask);
+#else
+		res = blkdev_issue_flush(bdev);
 #endif
 	}
 
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 701e49626..2a0fdfb78 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -4657,7 +4657,7 @@ static int scst_tgt_devs_cmds(struct list_head *tgt_dev_list)
 static void scst_wait_for_tgt_devs(struct list_head *tgt_dev_list)
 {
 	while (scst_tgt_devs_cmds(tgt_dev_list) > 0)
-		mdelay(100);
+		msleep(100);
 }
 
 int scst_acg_del_lun(struct scst_acg *acg, uint64_t lun,
@@ -14583,11 +14583,11 @@ static void scst_free_descriptors(struct scst_cmd *cmd)
 	return;
 }
 
-/**
- ** We currently have only few saved parameters and it is impossible to get
- ** pointer on a bit field, so let's have a simple straightforward
- ** implementation.
- **/
+/*
+ * We currently have only few saved parameters and it is impossible to get
+ * pointer on a bit field, so let's have a simple straightforward
+ * implementation.
+ */
 
 #define SCST_TAS_LABEL		"TAS"
 #define SCST_QERR_LABEL		"QERR"