diff --git a/iscsi-scst/kernel/config.c b/iscsi-scst/kernel/config.c
index 9d948f274..15d4bc488 100644
--- a/iscsi-scst/kernel/config.c
+++ b/iscsi-scst/kernel/config.c
@@ -25,8 +25,7 @@
 
 #define ISCSI_PROC_LOG_ENTRY_NAME	"trace_level"
 
-static struct scst_trace_log iscsi_local_trace_tbl[] =
-{
+static struct scst_trace_log iscsi_local_trace_tbl[] = {
     { TRACE_D_READ,		"d_read" },
     { TRACE_D_WRITE,		"d_write" },
     { TRACE_CONN_OC,		"conn" },
@@ -171,8 +170,7 @@ struct proc_entries {
 	const struct file_operations *const fops;
 };
 
-static struct proc_entries iscsi_proc_entries[] =
-{
+static struct proc_entries iscsi_proc_entries[] = {
 	{"session", &session_seq_fops},
 };
 
diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c
index 1cc3061ab..0680d3730 100644
--- a/iscsi-scst/kernel/iscsi.c
+++ b/iscsi-scst/kernel/iscsi.c
@@ -3144,8 +3144,7 @@ static int iscsi_target_release(struct scst_tgt *scst_tgt)
 }
 
 #ifndef CONFIG_SCST_PROC
-static struct scst_trace_log iscsi_local_trace_tbl[] =
-{
+static struct scst_trace_log iscsi_local_trace_tbl[] = {
     { TRACE_D_READ,		"d_read" },
     { TRACE_D_WRITE,		"d_write" },
     { TRACE_CONN_OC,		"conn" },
diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index 4e85259f2..20251e59d 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -48,8 +48,7 @@
 
 #define TRACE_ORDER	0x80000000
 
-static struct scst_trace_log vdisk_local_trace_tbl[] =
-{
+static struct scst_trace_log vdisk_local_trace_tbl[] = {
     { TRACE_ORDER,		"order" },
     { 0,			NULL }
 };
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index a49babde5..33425edfb 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -2048,8 +2048,9 @@ out:
 int scst_prepare_request_sense(struct scst_cmd *orig_cmd)
 {
 	int res = 0;
-	static const uint8_t request_sense[6] =
-	    { REQUEST_SENSE, 0, 0, 0, SCST_SENSE_BUFFERSIZE, 0 };
+	static const uint8_t request_sense[6] = {
+		REQUEST_SENSE, 0, 0, 0, SCST_SENSE_BUFFERSIZE, 0
+	};
 	struct scst_cmd *rs_cmd;
 
 	TRACE_ENTRY();
diff --git a/scst/src/scst_proc.c b/scst/src/scst_proc.c
index ae7554e5e..f773bed42 100644
--- a/scst/src/scst_proc.c
+++ b/scst/src/scst_proc.c
@@ -92,8 +92,7 @@ static struct proc_dir_entry *scst_proc_groups_root;
 #if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING)
 static struct scst_proc_data scst_log_proc_data;
 
-static struct scst_trace_log scst_proc_trace_tbl[] =
-{
+static struct scst_trace_log scst_proc_trace_tbl[] = {
     { TRACE_OUT_OF_MEM,		"out_of_mem" },
     { TRACE_MINOR,		"minor" },
     { TRACE_SG_OP,		"sg" },
@@ -114,8 +113,7 @@ static struct scst_trace_log scst_proc_trace_tbl[] =
     { 0,			NULL }
 };
 
-static struct scst_trace_log scst_proc_local_trace_tbl[] =
-{
+static struct scst_trace_log scst_proc_local_trace_tbl[] = {
     { TRACE_RTRY,		"retry" },
     { TRACE_SCSI_SERIALIZING,	"scsi_serializing" },
     { TRACE_RCV_BOT,		"recv_bot" },
@@ -163,8 +161,7 @@ static char *scst_proc_help_string =
 #endif
 ;
 
-static char *scst_proc_dev_handler_type[] =
-{
+static char *scst_proc_dev_handler_type[] = {
     "Direct-access device (e.g., magnetic disk)",
     "Sequential-access device (e.g., magnetic tape)",
     "Printer device",
@@ -414,11 +411,13 @@ out:
 
 #ifdef CONFIG_SCST_MEASURE_LATENCY
 
-static char *scst_io_size_names[] = { "<=8K  ",
-				      "<=32K ",
-				      "<=128K",
-				      "<=512K",
-				      ">512K " };
+static char *scst_io_size_names[] = {
+	"<=8K  ",
+	"<=32K ",
+	"<=128K",
+	"<=512K",
+	">512K "
+};
 
 static int lat_info_show(struct seq_file *seq, void *v)
 {
diff --git a/scst/src/scst_sysfs.c b/scst/src/scst_sysfs.c
index ac5772aab..f06af12de 100644
--- a/scst/src/scst_sysfs.c
+++ b/scst/src/scst_sysfs.c
@@ -40,8 +40,7 @@ static struct kobject *scst_handlers_kobj;
 struct sysfs_ops scst_sysfs_ops;
 EXPORT_SYMBOL(scst_sysfs_ops);
 
-static const char *scst_dev_handler_types[] =
-{
+static const char *scst_dev_handler_types[] = {
     "Direct-access device (e.g., magnetic disk)",
     "Sequential-access device (e.g., magnetic tape)",
     "Printer device",
@@ -64,8 +63,7 @@ static const char *scst_dev_handler_types[] =
 
 static DEFINE_MUTEX(scst_log_mutex);
 
-static struct scst_trace_log scst_trace_tbl[] =
-{
+static struct scst_trace_log scst_trace_tbl[] = {
     { TRACE_OUT_OF_MEM,		"out_of_mem" },
     { TRACE_MINOR,		"minor" },
     { TRACE_SG_OP,		"sg" },
@@ -86,8 +84,7 @@ static struct scst_trace_log scst_trace_tbl[] =
     { 0,			NULL }
 };
 
-static struct scst_trace_log scst_local_trace_tbl[] =
-{
+static struct scst_trace_log scst_local_trace_tbl[] = {
     { TRACE_RTRY,		"retry" },
     { TRACE_SCSI_SERIALIZING,	"scsi_serializing" },
     { TRACE_RCV_BOT,		"recv_bot" },