PCI: remove stupid MSI debugging code that was never used.

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 43fdb340c69741fdfac469dd86247213edb0d3d1..40d7cfc6c5cc5702ec9832a5f454d8374701d895 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -21,7 +21,6 @@
 
 #include <linux/pci_msi.h>
 
-_DEFINE_DBG_BUFFER
 
 static spinlock_t msi_lock = SPIN_LOCK_UNLOCKED;
 static struct msi_desc* msi_desc[NR_IRQS] = { [0 ... NR_IRQS-1] = NULL };

diff --git a/include/linux/pci_msi.h b/include/linux/pci_msi.h
index 0e42e65bc3e10277dc15ecea49865c2e715cdf7a..b638a07ba12565f78cb184f86ecd2145d97421dc 100644 (file)
--- a/include/linux/pci_msi.h
+++ b/include/linux/pci_msi.h
@@ -3,8 +3,8 @@
  *
  */
 
-#ifndef _ASM_PCI_MSI_H
-#define _ASM_PCI_MSI_H
+#ifndef PCI_MSI_H
+#define PCI_MSI_H
 
 #include <linux/pci.h>
 
@@ -82,29 +82,6 @@ extern void restore_ioapic_irq_handler(int irq);
 #define msix_mask(address)             (address | PCI_MSIX_FLAGS_BITMASK)
 #define msix_is_pending(address)       (address & PCI_MSIX_FLAGS_PENDMASK)
 
-extern char __dbg_str_buf[256];
-#define _DEFINE_DBG_BUFFER     char __dbg_str_buf[256];
-#define _DBG_K_TRACE_ENTRY     ((unsigned int)0x00000001)
-#define _DBG_K_TRACE_EXIT      ((unsigned int)0x00000002)
-#define _DBG_K_INFO            ((unsigned int)0x00000004)
-#define _DBG_K_ERROR           ((unsigned int)0x00000008)
-#define _DBG_K_TRACE   (_DBG_K_TRACE_ENTRY | _DBG_K_TRACE_EXIT)
-
-#define _DEBUG_LEVEL   (_DBG_K_INFO | _DBG_K_ERROR | _DBG_K_TRACE)
-#define _DBG_PRINT( dbg_flags, args... )               \
-if ( _DEBUG_LEVEL & (dbg_flags) )                      \
-{                                                      \
-       int len;                                        \
-       len = sprintf(__dbg_str_buf, "%s:%d: %s ",      \
-               __FILE__, __LINE__, __FUNCTION__ );     \
-       sprintf(__dbg_str_buf + len, args);             \
-       printk(KERN_INFO "%s\n", __dbg_str_buf);        \
-}
-
-#define MSI_FUNCTION_TRACE_ENTER       \
-       _DBG_PRINT (_DBG_K_TRACE_ENTRY, "%s", "[Entry]");
-#define MSI_FUNCTION_TRACE_EXIT                \
-       _DBG_PRINT (_DBG_K_TRACE_EXIT, "%s", "[Entry]");
 
 /*
  * MSI Defined Data Structures
@@ -190,4 +167,4 @@ struct msi_desc {
        struct pci_dev *dev;
 };
 
-#endif /* _ASM_PCI_MSI_H */
+#endif /* PCI_MSI_H */