linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / scsi / scsi_logging.h

diff --git a/drivers/scsi/scsi_logging.h b/drivers/scsi/scsi_logging.h
index 1f65139..e1722ba 100644 (file)
--- a/drivers/scsi/scsi_logging.h
+++ b/drivers/scsi/scsi_logging.h
@@ -1,6 +1,7 @@
 #ifndef _SCSI_LOGGING_H
 #define _SCSI_LOGGING_H
 
+#include <linux/config.h>
 
 /*
  * This defines the scsi logging feature.  It is a means by which the user
@@ -44,12 +45,10 @@ extern unsigned int scsi_logging_level;
         ((scsi_logging_level >> (SHIFT)) & ((1 << (BITS)) - 1))
 
 #define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD)            \
-do {                                                           \
+{                                                              \
         if (unlikely((SCSI_LOG_LEVEL(SHIFT, BITS)) > (LEVEL))) \
-               do {                                            \
-                       CMD;                                    \
-               } while (0);                                    \
-} while (0)
+               (CMD);                                          \
+}
 #else
 #define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD)
 #endif /* CONFIG_SCSI_LOGGING */