From f7915d582b9e69a4d2f949da286190df92c8453c Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Wed, 29 Jan 2014 00:07:14 +0000
Subject: [PATCH] Some more cleanups

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/iser@5244 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 iscsi-scst/kernel/conn.c                 |  1 +
 iscsi-scst/kernel/iscsi.c                | 11 +++--------
 iscsi-scst/kernel/isert-scst/isert_dbg.h |  1 +
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/iscsi-scst/kernel/conn.c b/iscsi-scst/kernel/conn.c
index 49595070d..ef043cffb 100644
--- a/iscsi-scst/kernel/conn.c
+++ b/iscsi-scst/kernel/conn.c
@@ -311,6 +311,7 @@ out_err:
 	goto out;
 }
 EXPORT_SYMBOL(conn_sysfs_add);
+
 #endif /* CONFIG_SCST_PROC */
 
 /* target_mutex supposed to be locked */
diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c
index 3554f77db..33e73f064 100644
--- a/iscsi-scst/kernel/iscsi.c
+++ b/iscsi-scst/kernel/iscsi.c
@@ -1915,9 +1915,6 @@ int cmnd_rx_continue(struct iscsi_cmnd *req)
 	struct iscsi_scsi_cmd_hdr *req_hdr = cmnd_hdr(req);
 	struct scst_cmd *scst_cmd = req->scst_cmd;
 	scst_data_direction dir;
-#ifdef CONFIG_SCST_DEBUG
-	bool unsolicited_data_expected = false;
-#endif
 	int res = 0;
 
 	TRACE_ENTRY();
@@ -1977,11 +1974,9 @@ int cmnd_rx_continue(struct iscsi_cmnd *req)
 	}
 
 trace:
-	TRACE_DBG("req=%p, dir=%d, unsolicited_data_expected=%d, "
-		"r2t_len_to_receive=%d, r2t_len_to_send=%d, bufflen=%d, "
-		"own_sg %d", req, dir, unsolicited_data_expected,
-		req->r2t_len_to_receive, req->r2t_len_to_send, req->bufflen,
-		req->own_sg);
+	TRACE_DBG("req=%p, dir=%d, r2t_len_to_receive=%d, r2t_len_to_send=%d, "
+		"bufflen=%d, own_sg %d", req, dir, req->r2t_len_to_receive,
+		req->r2t_len_to_send, req->bufflen, req->own_sg);
 
 out:
 	TRACE_EXIT_RES(res);
diff --git a/iscsi-scst/kernel/isert-scst/isert_dbg.h b/iscsi-scst/kernel/isert-scst/isert_dbg.h
index 49e32de13..064c714bf 100644
--- a/iscsi-scst/kernel/isert-scst/isert_dbg.h
+++ b/iscsi-scst/kernel/isert-scst/isert_dbg.h
@@ -23,6 +23,7 @@
 #endif
 
 #define LOG_PREFIX "isert" /* Prefix for SCST tracing macros. */
+
 #ifdef INSIDE_KERNEL_TREE
 #include <scst/scst_debug.h>
 #else