1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/scsi/libfc/fc_libfc.h b/drivers/scsi/libfc/fc_libfc.h
index e4b5e9280cb0..741fd5c72e13 100644
--- a/drivers/scsi/libfc/fc_libfc.h
+++ b/drivers/scsi/libfc/fc_libfc.h
@@ -22,22 +22,22 @@
 #define FC_LIBFC_LOGGING 0x01 /* General logging, not categorized */
 #define FC_LPORT_LOGGING 0x02 /* lport layer logging */
-#define FC_DISC_LOGGING  0x04 /* discovery layer logging */
+#define FC_DISC_LOGGING  0x04 /* discovery layer logging */
 #define FC_RPORT_LOGGING 0x08 /* rport layer logging */
-#define FC_FCP_LOGGING   0x10 /* I/O path logging */
+#define FC_FCP_LOGGING   0x10 /* I/O path logging */
-#define FC_EM_LOGGING    0x20 /* Exchange Manager logging */
+#define FC_EM_LOGGING    0x20 /* Exchange Manager logging */
-#define FC_EXCH_LOGGING  0x40 /* Exchange/Sequence logging */
+#define FC_EXCH_LOGGING  0x40 /* Exchange/Sequence logging */
-#define FC_SCSI_LOGGING  0x80 /* SCSI logging (mostly error handling) */
+#define FC_SCSI_LOGGING  0x80 /* SCSI logging (mostly error handling) */
 extern unsigned int fc_debug_logging;
-#define FC_CHECK_LOGGING(LEVEL, CMD)                            \
+#define FC_CHECK_LOGGING(LEVEL, CMD)                    \
-do {                                                            \
+        do {                                            \
-        if (unlikely(fc_debug_logging & LEVEL))                 \
+                if (unlikely(fc_debug_logging & LEVEL)) \
-                do {                                            \
+                        do {                            \
-                        CMD;                                    \
+                                CMD;                    \
-                } while (0);                                    \
+                        } while (0);                    \
-} while (0)
+        } while (0)
 #define FC_LIBFC_DBG(fmt, args...)                                      \
        FC_CHECK_LOGGING(FC_LIBFC_LOGGING,                              \
@@ -49,10 +49,10 @@ do {								\
                                (lport)->host->host_no,                 \
                                fc_host_port_id((lport)->host), ##args))
-#define FC_DISC_DBG(disc, fmt, args...)                                 \
+#define FC_DISC_DBG(disc, fmt, args...)                         \
-        FC_CHECK_LOGGING(FC_DISC_LOGGING,                               \
+        FC_CHECK_LOGGING(FC_DISC_LOGGING,                       \
-                         printk(KERN_INFO "host%u: disc: " fmt,         \
+                         printk(KERN_INFO "host%u: disc: " fmt, \
-                                (disc)->lport->host->host_no,           \
+                                (disc)->lport->host->host_no,   \
                                ##args))
 #define FC_RPORT_ID_DBG(lport, port_id, fmt, args...)                   \
@@ -77,7 +77,7 @@ do {								\
                                exch->xid, ##args))
 #define FC_SCSI_DBG(lport, fmt, args...)                                \
-        FC_CHECK_LOGGING(FC_SCSI_LOGGING,                               \
+        FC_CHECK_LOGGING(FC_SCSI_LOGGING,                               \
                         printk(KERN_INFO "host%u: scsi: " fmt,         \
                                (lport)->host->host_no, ##args))

diff --git a/drivers/scsi/libfc/fc_libfc.h b/drivers/scsi/libfc/fc_libfc.h index e4b5e9280cb0..741fd5c72e13 100644 --- a/drivers/scsi/libfc/fc_libfc.h +++ b/drivers/scsi/libfc/fc_libfc.h
@@ -22,22 +22,22 @@
22		22
23	#define FC_LIBFC_LOGGING 0x01 /* General logging, not categorized */	23	#define FC_LIBFC_LOGGING 0x01 /* General logging, not categorized */
24	#define FC_LPORT_LOGGING 0x02 /* lport layer logging */	24	#define FC_LPORT_LOGGING 0x02 /* lport layer logging */
25	#define FC_DISC_LOGGING 0x04 /* discovery layer logging */	25	#define FC_DISC_LOGGING 0x04 /* discovery layer logging */
26	#define FC_RPORT_LOGGING 0x08 /* rport layer logging */	26	#define FC_RPORT_LOGGING 0x08 /* rport layer logging */
27	#define FC_FCP_LOGGING 0x10 /* I/O path logging */	27	#define FC_FCP_LOGGING 0x10 /* I/O path logging */
28	#define FC_EM_LOGGING 0x20 /* Exchange Manager logging */	28	#define FC_EM_LOGGING 0x20 /* Exchange Manager logging */
29	#define FC_EXCH_LOGGING 0x40 /* Exchange/Sequence logging */	29	#define FC_EXCH_LOGGING 0x40 /* Exchange/Sequence logging */
30	#define FC_SCSI_LOGGING 0x80 /* SCSI logging (mostly error handling) */	30	#define FC_SCSI_LOGGING 0x80 /* SCSI logging (mostly error handling) */
31		31
32	extern unsigned int fc_debug_logging;	32	extern unsigned int fc_debug_logging;
33		33
34	#define FC_CHECK_LOGGING(LEVEL, CMD) \	34	#define FC_CHECK_LOGGING(LEVEL, CMD) \
35	do { \	35	do { \
36	if (unlikely(fc_debug_logging & LEVEL)) \	36	if (unlikely(fc_debug_logging & LEVEL)) \
37	do { \	37	do { \
38	CMD; \	38	CMD; \
39	} while (0); \	39	} while (0); \
40	} while (0)	40	} while (0)
41		41
42	#define FC_LIBFC_DBG(fmt, args...) \	42	#define FC_LIBFC_DBG(fmt, args...) \
43	FC_CHECK_LOGGING(FC_LIBFC_LOGGING, \	43	FC_CHECK_LOGGING(FC_LIBFC_LOGGING, \
@@ -49,10 +49,10 @@ do { \
49	(lport)->host->host_no, \	49	(lport)->host->host_no, \
50	fc_host_port_id((lport)->host), ##args))	50	fc_host_port_id((lport)->host), ##args))
51		51
52	#define FC_DISC_DBG(disc, fmt, args...) \	52	#define FC_DISC_DBG(disc, fmt, args...) \
53	FC_CHECK_LOGGING(FC_DISC_LOGGING, \	53	FC_CHECK_LOGGING(FC_DISC_LOGGING, \
54	printk(KERN_INFO "host%u: disc: " fmt, \	54	printk(KERN_INFO "host%u: disc: " fmt, \
55	(disc)->lport->host->host_no, \	55	(disc)->lport->host->host_no, \
56	##args))	56	##args))
57		57
58	#define FC_RPORT_ID_DBG(lport, port_id, fmt, args...) \	58	#define FC_RPORT_ID_DBG(lport, port_id, fmt, args...) \
@@ -77,7 +77,7 @@ do { \
77	exch->xid, ##args))	77	exch->xid, ##args))
78		78
79	#define FC_SCSI_DBG(lport, fmt, args...) \	79	#define FC_SCSI_DBG(lport, fmt, args...) \
80	FC_CHECK_LOGGING(FC_SCSI_LOGGING, \	80	FC_CHECK_LOGGING(FC_SCSI_LOGGING, \
81	printk(KERN_INFO "host%u: scsi: " fmt, \	81	printk(KERN_INFO "host%u: scsi: " fmt, \
82	(lport)->host->host_no, ##args))	82	(lport)->host->host_no, ##args))
83		83