[SCSI] qla2xxx: Cleanup DEBUG macro usage.

- macro usage statements should terminate with a ';'
- remove unused macros.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 43 insertions, 55 deletions

diff --git a/drivers/scsi/qla2xxx/qla_dbg.h b/drivers/scsi/qla2xxx/qla_dbg.h
index ace6afdfe708..2cea0097fbab 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.h
+++ b/drivers/scsi/qla2xxx/qla_dbg.h
@@ -37,122 +37,110 @@
 /*
 * Macros use for debugging the driver.
 */
-#undef ENTER_TRACE
-#if defined(ENTER_TRACE)
-#define ENTER(x)        do { printk("qla2100 : Entering %s()\n", x); } while (0)
-#define LEAVE(x)        do { printk("qla2100 : Leaving %s()\n", x);  } while (0)
-#define ENTER_INTR(x)   do { printk("qla2100 : Entering %s()\n", x); } while (0)
-#define LEAVE_INTR(x)   do { printk("qla2100 : Leaving %s()\n", x);  } while (0)
-#else
-#define ENTER(x)        do {} while (0)
-#define LEAVE(x)        do {} while (0)
-#define ENTER_INTR(x)   do {} while (0)
-#define LEAVE_INTR(x)   do {} while (0)
-#endif
 
 #if  DEBUG_QLA2100
-#define DEBUG(x)        do {x;} while (0);
+#define DEBUG(x)        do {x;} while (0)
 #else
-#define DEBUG(x)        do {} while (0);
+#define DEBUG(x)        do {} while (0)
 #endif
 
 #if defined(QL_DEBUG_LEVEL_1)
-#define DEBUG1(x)       do {x;} while (0);
+#define DEBUG1(x)       do {x;} while (0)
 #else
-#define DEBUG1(x)       do {} while (0);
+#define DEBUG1(x)       do {} while (0)
 #endif
 
 #if defined(QL_DEBUG_LEVEL_2)
-#define DEBUG2(x)       do {x;} while (0);
-#define DEBUG2_3(x)     do {x;} while (0);
-#define DEBUG2_3_11(x)  do {x;} while (0);
-#define DEBUG2_9_10(x)    do {x;} while (0);
-#define DEBUG2_11(x)    do {x;} while (0);
-#define DEBUG2_13(x)    do {x;} while (0);
+#define DEBUG2(x)       do {x;} while (0)
+#define DEBUG2_3(x)     do {x;} while (0)
+#define DEBUG2_3_11(x)  do {x;} while (0)
+#define DEBUG2_9_10(x)    do {x;} while (0)
+#define DEBUG2_11(x)    do {x;} while (0)
+#define DEBUG2_13(x)    do {x;} while (0)
 #else
-#define DEBUG2(x)       do {} while (0);
+#define DEBUG2(x)       do {} while (0)
 #endif
 
 #if defined(QL_DEBUG_LEVEL_3)
-#define DEBUG3(x)       do {x;} while (0);
-#define DEBUG2_3(x)     do {x;} while (0);
-#define DEBUG2_3_11(x)  do {x;} while (0);
-#define DEBUG3_11(x)    do {x;} while (0);
+#define DEBUG3(x)       do {x;} while (0)
+#define DEBUG2_3(x)     do {x;} while (0)
+#define DEBUG2_3_11(x)  do {x;} while (0)
+#define DEBUG3_11(x)    do {x;} while (0)
 #else
-#define DEBUG3(x)       do {} while (0);
+#define DEBUG3(x)       do {} while (0)
   #if !defined(QL_DEBUG_LEVEL_2)
-  #define DEBUG2_3(x)   do {} while (0);
+  #define DEBUG2_3(x)   do {} while (0)
   #endif
 #endif
 
 #if defined(QL_DEBUG_LEVEL_4)
-#define DEBUG4(x)       do {x;} while (0);
+#define DEBUG4(x)       do {x;} while (0)
 #else
-#define DEBUG4(x)       do {} while (0);
+#define DEBUG4(x)       do {} while (0)
 #endif
 
 #if defined(QL_DEBUG_LEVEL_5)
-#define DEBUG5(x)          do {x;} while (0);
+#define DEBUG5(x)          do {x;} while (0)
 #else
-#define DEBUG5(x)       do {} while (0);
+#define DEBUG5(x)       do {} while (0)
 #endif
 
 #if defined(QL_DEBUG_LEVEL_7)
-#define DEBUG7(x)          do {x;} while (0);
+#define DEBUG7(x)          do {x;} while (0)
 #else
-#define DEBUG7(x)          do {} while (0);
+#define DEBUG7(x)          do {} while (0)
 #endif
 
 #if defined(QL_DEBUG_LEVEL_9)
-#define DEBUG9(x)       do {x;} while (0);
-#define DEBUG9_10(x)    do {x;} while (0);
-#define DEBUG2_9_10(x)  do {x;} while (0);
+#define DEBUG9(x)       do {x;} while (0)
+#define DEBUG9_10(x)    do {x;} while (0)
+#define DEBUG2_9_10(x)  do {x;} while (0)
 #else
-#define DEBUG9(x)       do {} while (0);
+#define DEBUG9(x)       do {} while (0)
 #endif
 
 #if defined(QL_DEBUG_LEVEL_10)
-#define DEBUG10(x)      do {x;} while (0);
-#define DEBUG2_9_10(x)  do {x;} while (0);
-#define DEBUG9_10(x)    do {x;} while (0);
+#define DEBUG10(x)      do {x;} while (0)
+#define DEBUG2_9_10(x)  do {x;} while (0)
+#define DEBUG9_10(x)    do {x;} while (0)
 #else
-#define DEBUG10(x)      do {} while (0);
+#define DEBUG10(x)      do {} while (0)
   #if !defined(DEBUG2_9_10)
-  #define DEBUG2_9_10(x)        do {} while (0);
+  #define DEBUG2_9_10(x)        do {} while (0)
   #endif
   #if !defined(DEBUG9_10)
-  #define DEBUG9_10(x)  do {} while (0);
+  #define DEBUG9_10(x)  do {} while (0)
   #endif
 #endif
 
 #if defined(QL_DEBUG_LEVEL_11)
-#define DEBUG11(x)      do{x;} while(0);
+#define DEBUG11(x)      do{x;} while(0)
 #if !defined(DEBUG2_11)
-#define DEBUG2_11(x)    do{x;} while(0);
+#define DEBUG2_11(x)    do{x;} while(0)
 #endif
 #if !defined(DEBUG2_3_11)
-#define DEBUG2_3_11(x)  do{x;} while(0);
+#define DEBUG2_3_11(x)  do{x;} while(0)
 #endif
 #if !defined(DEBUG3_11)
-#define DEBUG3_11(x)    do{x;} while(0);
+#define DEBUG3_11(x)    do{x;} while(0)
 #endif
 #else
-#define DEBUG11(x)      do{} while(0);
+#define DEBUG11(x)      do{} while(0)
   #if !defined(QL_DEBUG_LEVEL_2)
-  #define DEBUG2_11(x)  do{} while(0);
+  #define DEBUG2_11(x)  do{} while(0)
     #if !defined(QL_DEBUG_LEVEL_3)
-    #define DEBUG2_3_11(x) do{} while(0);
+    #define DEBUG2_3_11(x) do{} while(0)
     #endif
   #endif
   #if !defined(QL_DEBUG_LEVEL_3)
-  #define DEBUG3_11(x)  do{} while(0);
+  #define DEBUG3_11(x)  do{} while(0)
   #endif
 #endif
 
 #if defined(QL_DEBUG_LEVEL_12)
-#define DEBUG12(x)      do {x;} while (0);
+#define DEBUG12(x)      do {x;} while (0)
 #else
-#define DEBUG12(x)      do {} while (0);
+#define DEBUG12(x)      do {} while (0)
 #endif
 
 #if defined(QL_DEBUG_LEVEL_13)