Consolidate debugging and make it conditional

1 files changed, 23 insertions, 15 deletions

diff --git a/cryptodev_main.c b/cryptodev_main.c
index 6249a1b..f7a6d86 100644
--- a/cryptodev_main.c
+++ b/cryptodev_main.c
@@ -38,6 +38,8 @@
 #include "alg.h"
 #include "ncr-int.h"
 
+#undef DEBUG
+
 MODULE_AUTHOR("Nikos Mavrogiannopoulos <nmav@gnutls.org>");
 MODULE_DESCRIPTION("CryptoDev driver");
 MODULE_LICENSE("GPL");
@@ -101,13 +103,6 @@ struct data_sock {
 	unsigned index;
 };
 
-static void __dump_data_sock(int line, const struct data_sock *dsk)
-{
-	printk(KERN_DEBUG "@%d: %p: cnt %d, master %p, index %u\n", line, dsk,
-	       atomic_read(&dsk->sk.sk_refcnt), dsk->master, dsk->index);
-}
-#define DUMP_DSK(DSK) (__dump_data_sock(__LINE__, (DSK)))
-
 /* A socket holding a crypto_tfm. */
 struct alg_sock {
 	struct sock sk;
@@ -117,14 +112,6 @@ struct alg_sock {
 	struct hash_data hash;
 };
 
-static void __dump_alg_sock(int line, const struct alg_sock *ask)
-{
-	printk(KERN_DEBUG "@%d: %p: cnt %d, slave %p: %u/%u, hash %d\n", line,
-	       ask, atomic_read(&ask->sk.sk_refcnt), ask->slaves[0],
-	       ask->accept_idx, ask->num_slaves, ask->hash.init);
-}
-#define DUMP_ASK(ASK) (__dump_alg_sock(__LINE__, (ASK)))
-
 /* Socket reference counting:
    The primary reference to alg_sock is from user-space.
 
@@ -147,6 +134,27 @@ static struct alg_sock *alg_sk(struct sock *sk)
 	return container_of(sk, struct alg_sock, sk);
 }
 
+#ifdef DEBUG
+static void __dump_data_sock(int line, const struct data_sock *dsk)
+{
+	printk(KERN_DEBUG "@%d: %p: cnt %d, master %p, index %u\n", line, dsk,
+	       atomic_read(&dsk->sk.sk_refcnt), dsk->master, dsk->index);
+}
+#define DUMP_DSK(DSK) (__dump_data_sock(__LINE__, (DSK)))
+
+static void __dump_alg_sock(int line, const struct alg_sock *ask)
+{
+	printk(KERN_DEBUG "@%d: %p: cnt %d, slave %p: %u/%u, hash %d\n", line,
+	       ask, atomic_read(&ask->sk.sk_refcnt), ask->slaves[0],
+	       ask->accept_idx, ask->num_slaves, ask->hash.init);
+}
+#define DUMP_ASK(ASK) (__dump_alg_sock(__LINE__, (ASK)))
+
+#else /* !DEBUG */
+#define DUMP_DSK(DSK) ((void)0)
+#define DUMP_ASK(ASK) ((void)0)
+#endif /* !DEBUG */
+
 static struct proto data_proto = {
 /* 	int			(*init)(struct sock *sk); */
 /* 	void			(*destroy)(struct sock *sk); */