diff --git a/iscsi-scst/kernel/isert-scst/iser_rdma.c b/iscsi-scst/kernel/isert-scst/iser_rdma.c
index 1b3e849a9..1f1c56e66 100644
--- a/iscsi-scst/kernel/isert-scst/iser_rdma.c
+++ b/iscsi-scst/kernel/isert-scst/iser_rdma.c
@@ -136,8 +136,10 @@ void isert_post_drain(struct isert_connection *isert_conn)
 		err = ib_post_send(isert_conn->qp, &isert_conn->drain_wr.send_wr, &bad_wr);
 		if (unlikely(err)) {
 			pr_err("Failed to post drain wr, err:%d\n", err);
-			/* We need to decrement iser_conn->kref in order to be able to cleanup
-			 * the connection */
+			/*
+			 * We need to decrement iser_conn->kref in order to be
+			 * able to cleanup the connection.
+			 */
 			set_bit(ISERT_DRAIN_FAILED, &isert_conn->flags);
 			isert_conn_free(isert_conn);
 		}
@@ -633,9 +635,11 @@ static void isert_handle_wc_error(struct ib_wc *wc)
 				isert_buf->dma_dir);
 			isert_buf->sg_cnt = 0;
 		}
-		/* RDMA-WR and SEND response of a READ task
-		   are sent together, so when receiving RDMA-WR error,
-		   wait until SEND error arrives to complete the task */
+		/*
+		 * RDMA-WR and SEND response of a READ task
+		 * are sent together, so when receiving RDMA-WR error,
+		 * wait until SEND error arrives to complete the task.
+		 */
 		break;
 	default:
 		pr_err("unexpected opcode %d, wc:%p wr_id:%p conn:%p\n",
diff --git a/iscsi-scst/kernel/isert-scst/isert.c b/iscsi-scst/kernel/isert-scst/isert.c
index 5cdc28901..a8a382ca2 100644
--- a/iscsi-scst/kernel/isert-scst/isert.c
+++ b/iscsi-scst/kernel/isert-scst/isert.c
@@ -282,9 +282,11 @@ static void isert_free_conn(struct iscsi_conn *conn)
 int isert_handle_close_connection(struct iscsi_conn *conn)
 {
 	isert_mark_conn_closed(conn, 0);
-	/* Take care of case where our connection is being closed
-	 * without being connected to a session - if connection allocation
-	 * failed for some reason */
+	/*
+	 * Take care of case where our connection is being closed without
+	 * being connected to a session - if connection allocation failed for
+	 * some reason.
+	 */
 	if (unlikely(!conn->session))
 		isert_free_connection(conn);
 	else
diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index 58b7076fa..37b7ef1b3 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -190,10 +190,10 @@ struct scst_vdisk_dev {
 	uint64_t format_progress_to_do, format_progress_done;
 
 	int virt_id;
-	char name[64+1];	/* Name of the virtual device,
-				   must be <= SCSI Model + 1 */
-	char *filename;		/* File name, protected by
-				   scst_mutex and suspended activities */
+	/* Name of the virtual device, must be <= SCSI Model + 1 */
+	char name[64+1];
+	/* File name, protected by scst_mutex and suspended activities */
+	char *filename;
 	uint16_t command_set_version;
 
 	/* All 14 protected by vdisk_serial_rwlock */
@@ -5494,8 +5494,10 @@ static enum compl_status_e vdisk_exec_read_toc(struct vdisk_cmd_params *p)
 	off = 4;
 	if (cmd->cdb[6] <= 1) {
 		/* Fistr TOC Track Descriptor */
-		/* ADDR    0x10 - Q Sub-channel encodes current position data
-		   CONTROL 0x04 - Data track, recoreded uninterrupted */
+		/*
+		 * ADDR    0x10 - Q Sub-channel encodes current position data
+		 * CONTROL 0x04 - Data track, recoreded uninterrupted
+		 */
 		buffer[off+1] = 0x14;
 		/* Track Number */
 		buffer[off+2] = 0x01;
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index d13c39ca4..e85c9e688 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -492,19 +492,19 @@ static int get_cdb_info_var_len(struct scst_cmd *cmd,
 	const struct scst_sdbops *sdbops);
 
 /*
-+=====================================-============-======-
-|  Command name                       | Operation  | Type |
-|                                     |   code     |      |
-|-------------------------------------+------------+------+
-
-+=========================================================+
-|Key:  M = command implementation is mandatory.           |
-|      O = command implementation is optional.            |
-|      V = Vendor-specific                                |
-|      R = Reserved                                       |
-|     ' '= DON'T use for this device                      |
-+=========================================================+
-*/
+ * +=====================================-============-======-
+ * |  Command name                       | Operation  | Type |
+ * |                                     |   code     |      |
+ * |-------------------------------------+------------+------+
+ * 
+ * +=========================================================+
+ * |Key:  M = command implementation is mandatory.           |
+ * |      O = command implementation is optional.            |
+ * |      V = Vendor-specific                                |
+ * |      R = Reserved                                       |
+ * |     ' '= DON'T use for this device                      |
+ * +=========================================================+
+ */
 
 #define SCST_CDB_MANDATORY  'M'	/* mandatory */
 #define SCST_CDB_OPTIONAL   'O'	/* optional  */
@@ -581,7 +581,8 @@ static const struct scst_sdbops scst_scsi_op_table[] = {
 	 *                       ||||||||||  |||+----> Optical card   (F)
 	 *                       ||||||||||  ||||
 	 *                       ||||||||||  ||||
-	 *                       0123456789ABCDEF -> TYPE_????     */
+	 *                       0123456789ABCDEF -> TYPE_????
+	 */
 
 	/* 6-bytes length CDB */
 	{.ops = 0x00, .devkey = "MMMMMMMMMMMMMMMM",
diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c
index f6d8a01e7..c2c2841f1 100644
--- a/scst/src/scst_targ.c
+++ b/scst/src/scst_targ.c
@@ -6306,8 +6306,10 @@ static int scst_clear_task_set(struct scst_mgmt_cmd *mcmd)
 	return res;
 }
 
-/* Returns 0 if the command processing should be continued,
- * >0, if it should be requeued, <0 otherwise */
+/*
+ * Returns 0 if the command processing should be continued,
+ * >0, if it should be requeued, <0 otherwise.
+ */
 static int scst_mgmt_cmd_init(struct scst_mgmt_cmd *mcmd)
 {
 	int res = 0, rc, t;