diff --git a/scst/include/scst.h b/scst/include/scst.h
index 5d3b07a84..8fff1a3c9 100644
--- a/scst/include/scst.h
+++ b/scst/include/scst.h
@@ -1506,7 +1506,7 @@ struct scst_tgt_dev {
 
 	/*
 	 * Set if the prev cmd was ORDERED. Size must allow unprotected
-	 * modifications independant to the neighbour fields. 
+	 * modifications independant to the neighbour fields.
 	 */
 	unsigned long prev_cmd_ordered;
 
diff --git a/scst/src/dev_handlers/scst_user.c b/scst/src/dev_handlers/scst_user.c
index f8f07d721..3aa6a5cef 100644
--- a/scst/src/dev_handlers/scst_user.c
+++ b/scst/src/dev_handlers/scst_user.c
@@ -2332,9 +2332,9 @@ static int dev_user_attach_tgt(struct scst_tgt_dev *tgt_dev)
 	 * memory for SCST local commands, like REPORT LUNS, where there is no
 	 * corresponding ucmd. Otherwise we will crash in dev_user_alloc_sg().
 	 */
- 	if (test_bit(SCST_TGT_DEV_CLUST_POOL, &tgt_dev->tgt_dev_flags))
+	if (test_bit(SCST_TGT_DEV_CLUST_POOL, &tgt_dev->tgt_dev_flags))
 		tgt_dev->dh_priv = dev->pool_clust;
- 	else
+	else
 		tgt_dev->dh_priv = dev->pool;
 
 	ucmd = dev_user_alloc_ucmd(dev, GFP_KERNEL);
diff --git a/scst/src/scst_mem.c b/scst/src/scst_mem.c
index 538e6ab32..5dd09ad86 100644
--- a/scst/src/scst_mem.c
+++ b/scst/src/scst_mem.c
@@ -39,7 +39,7 @@ static struct scst_sgv_pools_manager sgv_pools_mgr;
 
 static inline bool sgv_pool_clustered(const struct sgv_pool *pool)
 {
-	return (pool->clustering_type != sgv_no_clustering);
+	return pool->clustering_type != sgv_no_clustering;
 }
 
 void scst_sgv_pool_use_norm(struct scst_tgt_dev *tgt_dev)
@@ -996,7 +996,7 @@ int sgv_pool_init(struct sgv_pool *pool, const char *name,
 			size = sizeof(*obj) + (1 << i) *
 				(sizeof(obj->sg_entries[0]) +
 				 ((clustering_type != sgv_no_clustering) ?
-				 	sizeof(obj->trans_tbl[0]) : 0));
+					sizeof(obj->trans_tbl[0]) : 0));
 		} else if (i <= sgv_pools_mgr.sgv_max_trans_order) {
 			/*
 			 * sgv ie sg_entries is allocated outside object, but