diff --git a/qla2x00t/qla2x00-target/qla2x00t.h b/qla2x00t/qla2x00-target/qla2x00t.h
index d306df198..b1e8f6817 100644
--- a/qla2x00t/qla2x00-target/qla2x00t.h
+++ b/qla2x00t/qla2x00-target/qla2x00t.h
@@ -56,7 +56,7 @@
 /* Immediate notify task flags */
 #define IMM_NTFY_TASK_MGMT_SHIFT    9
 
-#define Q2T_CLEAR_ACA          	    0x40
+#define Q2T_CLEAR_ACA               0x40
 #define Q2T_TARGET_RESET            0x20
 #define Q2T_LUN_RESET               0x10
 #define Q2T_CLEAR_TS                0x04
diff --git a/scst/README b/scst/README
index 2d40aaf3a..fa24664ed 100644
--- a/scst/README
+++ b/scst/README
@@ -281,7 +281,7 @@ in/out in Makefile:
    doesn't submit commands to SCST in IRQ context. For instance,
    iSCSI-SCST doesn't do that, but qla2x00t with
    CONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD disabled - does. This option is
-   designed to be used with vdisk NULLIO backend. 
+   designed to be used with vdisk NULLIO backend.
 
    WARNING! Using with other backend than vdisk NULLIO is unsafe and can
    lead you to a kernel crash!
diff --git a/scst/README_in-tree b/scst/README_in-tree
index e889ce23d..5e4c0bf00 100644
--- a/scst/README_in-tree
+++ b/scst/README_in-tree
@@ -206,7 +206,7 @@ your favorite kernel configuration Makefile target, e.g. "make xconfig":
    doesn't submit commands to SCST in IRQ context. For instance,
    iSCSI-SCST doesn't do that, but qla2x00t with
    CONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD disabled - does. This option is
-   designed to be used with vdisk NULLIO backend. 
+   designed to be used with vdisk NULLIO backend.
 
    WARNING! Using with other backend than vdisk NULLIO is unsafe and can
    lead you to a kernel crash!
diff --git a/scst/include/scst.h b/scst/include/scst.h
index 5b784a1ee..5c1a14d07 100644
--- a/scst/include/scst.h
+++ b/scst/include/scst.h
@@ -1920,7 +1920,7 @@ struct scst_dev_registrant {
 
 	/* List entry for dev_registrants_list */
 	struct list_head dev_registrants_list_entry;
-	
+
 	/* 2 auxiliary fields used to rollback changes for errors, etc. */
 	struct list_head aux_list_entry;
 	uint64_t rollback_key;
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index c6b56de4b..da9f87944 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -217,7 +217,7 @@ static const struct scst_sdbops scst_scsi_op_table[] = {
 #ifdef CONFIG_SCST_TEST_IO_IN_SIRQ
 			  SCST_TEST_IO_IN_SIRQ_ALLOWED|
 #endif
-	 		  SCST_WRITE_MEDIUM,
+			  SCST_WRITE_MEDIUM,
 	 4, get_trans_len_1_256},
 	{0x0A, " M  O  OV       ", "WRITE(6)",
 	 SCST_DATA_WRITE, SCST_TRANSFER_LEN_TYPE_FIXED|SCST_WRITE_MEDIUM,
@@ -330,7 +330,7 @@ static const struct scst_sdbops scst_scsi_op_table[] = {
 #ifdef CONFIG_SCST_TEST_IO_IN_SIRQ
 			  SCST_TEST_IO_IN_SIRQ_ALLOWED|
 #endif
-	 		  SCST_WRITE_MEDIUM,
+			  SCST_WRITE_MEDIUM,
 	 7, get_trans_len_2},
 	{0x2A, "         O      ", "SEND MESSAGE(10)",
 	 SCST_DATA_WRITE, FLAG_NONE, 7, get_trans_len_2},
@@ -513,7 +513,7 @@ static const struct scst_sdbops scst_scsi_op_table[] = {
 #ifdef CONFIG_SCST_TEST_IO_IN_SIRQ
 			  SCST_TEST_IO_IN_SIRQ_ALLOWED|
 #endif
-	 		  SCST_WRITE_MEDIUM,
+			  SCST_WRITE_MEDIUM,
 	 10, get_trans_len_4},
 	{0x8C, "OOOOOOOOOO      ", "READ ATTRIBUTE",
 	 SCST_DATA_READ, FLAG_NONE, 10, get_trans_len_4},
@@ -595,7 +595,7 @@ static const struct scst_sdbops scst_scsi_op_table[] = {
 #ifdef CONFIG_SCST_TEST_IO_IN_SIRQ
 			  SCST_TEST_IO_IN_SIRQ_ALLOWED|
 #endif
-	 		  SCST_WRITE_MEDIUM,
+			  SCST_WRITE_MEDIUM,
 	 6, get_trans_len_4},
 	{0xAA, "         O      ", "SEND MESSAGE(12)",
 	 SCST_DATA_WRITE, FLAG_NONE, 6, get_trans_len_4},
diff --git a/scst/src/scst_pres.c b/scst/src/scst_pres.c
index ceed7e38c..4b53731e1 100644
--- a/scst/src/scst_pres.c
+++ b/scst/src/scst_pres.c
@@ -1074,8 +1074,8 @@ out:
 	 * to return HARDWARE ERROR and screw up all the interaction with
 	 * the affected initiator.
 	 */
-	 if (cmd != NULL)
-		 scst_set_cmd_error(cmd, SCST_LOAD_SENSE(scst_sense_hardw_error));
+	if (cmd != NULL)
+		scst_set_cmd_error(cmd, SCST_LOAD_SENSE(scst_sense_hardw_error));
 #endif
 	}
 
diff --git a/scst/src/scst_pres.h b/scst/src/scst_pres.h
index a8669c1c1..547251fcd 100644
--- a/scst/src/scst_pres.h
+++ b/scst/src/scst_pres.h
@@ -35,7 +35,7 @@
 
 #define TYPE_UNSPECIFIED			(-1)
 #define TYPE_WRITE_EXCLUSIVE			0x01
-#define TYPE_EXCLUSIVE_ACCESS 			0x03
+#define TYPE_EXCLUSIVE_ACCESS			0x03
 #define TYPE_WRITE_EXCLUSIVE_REGONLY		0x05
 #define TYPE_EXCLUSIVE_ACCESS_REGONLY		0x06
 #define TYPE_WRITE_EXCLUSIVE_ALL_REG		0x07
diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c
index 14c9885ea..d1161d363 100644
--- a/scst/src/scst_targ.c
+++ b/scst/src/scst_targ.c
@@ -4715,7 +4715,7 @@ static int scst_set_mcmd_next_state(struct scst_mgmt_cmd *mcmd)
 				"preparing to wait", mcmd->cmd_done_wait_count);
 			mcmd->state = SCST_MCMD_STATE_WAITING_AFFECTED_CMDS_DONE;
 			res = -1;
-		} 
+		}
 		break;
 
 	case SCST_MCMD_STATE_AFFECTED_CMDS_DONE:
@@ -4728,7 +4728,7 @@ static int scst_set_mcmd_next_state(struct scst_mgmt_cmd *mcmd)
 				mcmd->cmd_finish_wait_count);
 			mcmd->state = SCST_MCMD_STATE_WAITING_AFFECTED_CMDS_FINISHED;
 			res = -1;
-		} 
+		}
 		break;
 
 	case SCST_MCMD_STATE_DONE:
diff --git a/scst_local/scst_local.c b/scst_local/scst_local.c
index ba508751f..97f60bdeb 100644
--- a/scst_local/scst_local.c
+++ b/scst_local/scst_local.c
@@ -769,7 +769,7 @@ static void scst_local_remove_adapter(void)
 }
 
 static struct scsi_host_template scst_lcl_ini_driver_template = {
-	.proc_info 			= scst_local_proc_info,
+	.proc_info			= scst_local_proc_info,
 	.proc_name			= scst_local_proc_name,
 	.name				= SCST_LOCAL_NAME,
 	.info				= scst_local_info,