1 files changed, 18 insertions, 55 deletions

diff --git a/drivers/scsi/bnx2fc/bnx2fc_debug.h b/drivers/scsi/bnx2fc/bnx2fc_debug.h
index 3416d9a746c7..4808ff99621f 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_debug.h
+++ b/drivers/scsi/bnx2fc/bnx2fc_debug.h
@@ -11,60 +11,23 @@
 
 extern unsigned int bnx2fc_debug_level;
 
-#define BNX2FC_CHK_LOGGING(LEVEL, CMD)                                  \
-        do {                                                            \
-                if (unlikely(bnx2fc_debug_level & LEVEL))               \
-                        do {                                            \
-                                CMD;                                    \
-                        } while (0);                                    \
-        } while (0)
-
-#define BNX2FC_ELS_DBG(fmt, arg...)                                     \
-        BNX2FC_CHK_LOGGING(LOG_ELS,                                     \
-                           printk(KERN_INFO PFX fmt, ##arg))
-
-#define BNX2FC_MISC_DBG(fmt, arg...)                                    \
-        BNX2FC_CHK_LOGGING(LOG_MISC,                                    \
-                           printk(KERN_INFO PFX fmt, ##arg))
-
-#define BNX2FC_IO_DBG(io_req, fmt, arg...)                              \
-        do {                                                            \
-                if (!io_req || !io_req->port || !io_req->port->lport || \
-                    !io_req->port->lport->host)                         \
-                        BNX2FC_CHK_LOGGING(LOG_IO,                      \
-                           printk(KERN_INFO PFX "NULL " fmt, ##arg));   \
-                else                                                    \
-                        BNX2FC_CHK_LOGGING(LOG_IO,                      \
-                           shost_printk(KERN_INFO,                      \
-                                   (io_req)->port->lport->host,         \
-                                   PFX "xid:0x%x " fmt,                 \
-                                   (io_req)->xid, ##arg));              \
-        } while (0)
-
-#define BNX2FC_TGT_DBG(tgt, fmt, arg...)                                \
-        do {                                                            \
-                if (!tgt || !tgt->port || !tgt->port->lport ||          \
-                    !tgt->port->lport->host || !tgt->rport)             \
-                        BNX2FC_CHK_LOGGING(LOG_TGT,                     \
-                           printk(KERN_INFO PFX "NULL " fmt, ##arg));   \
-                else                                                    \
-                        BNX2FC_CHK_LOGGING(LOG_TGT,                     \
-                           shost_printk(KERN_INFO,                      \
-                                   (tgt)->port->lport->host,            \
-                                   PFX "port:%x " fmt,                  \
-                                   (tgt)->rport->port_id, ##arg));      \
-        } while (0)
-
-
-#define BNX2FC_HBA_DBG(lport, fmt, arg...)                              \
-        do {                                                            \
-                if (!lport || !lport->host)                             \
-                        BNX2FC_CHK_LOGGING(LOG_HBA,                     \
-                           printk(KERN_INFO PFX "NULL " fmt, ##arg));   \
-                else                                                    \
-                        BNX2FC_CHK_LOGGING(LOG_HBA,                     \
-                           shost_printk(KERN_INFO, lport->host, \
-                                   PFX fmt, ##arg));                    \
-        } while (0)
+#define BNX2FC_ELS_DBG(fmt, ...)                                \
+do {                                                            \
+        if (unlikely(bnx2fc_debug_level & LOG_ELS))             \
+                pr_info(fmt, ##__VA_ARGS__);                    \
+} while (0)
+
+#define BNX2FC_MISC_DBG(fmt, ...)                               \
+do {                                                            \
+        if (unlikely(bnx2fc_debug_level & LOG_MISC))            \
+                pr_info(fmt, ##__VA_ARGS__);                    \
+} while (0)
+
+__printf(2, 3)
+void BNX2FC_IO_DBG(const struct bnx2fc_cmd *io_req, const char *fmt, ...);
+__printf(2, 3)
+void BNX2FC_TGT_DBG(const struct bnx2fc_rport *tgt, const char *fmt, ...);
+__printf(2, 3)
+void BNX2FC_HBA_DBG(const struct fc_lport *lport, const char *fmt, ...);
 
 #endif