PCI: Call dma_debug_add_bus() for pci_bus_type from PCI core

There is nothing arch-specific about PCI or dma-debug, so call
dma_debug_add_bus() from the PCI core just after registering the bus type.

Most of dma-debug is already generic; this just adds reporting of pending
dma-allocations on driver unload for arches other than powerpc, sh, and
x86.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)

diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
index 155170d70324c90ebd609dda0a210331e9bdabc3..dbfc7056d7df7670b875c2df35bc8e2f2bf14bc8 100644 (file)
--- a/arch/powerpc/kernel/dma.c
+++ b/arch/powerpc/kernel/dma.c
@@ -357,9 +357,6 @@ EXPORT_SYMBOL_GPL(dma_get_required_mask);
 
 static int __init dma_init(void)
 {
-#ifdef CONFIG_PCI
-       dma_debug_add_bus(&pci_bus_type);
-#endif
 #ifdef CONFIG_IBMVIO
        dma_debug_add_bus(&vio_bus_type);
 #endif

diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index e5b7437ab4afa3244dcf68f60240786a3474d2b3..8256626bc53cc0125db0f3032ee1dcc0326442b3 100644 (file)
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -160,8 +160,6 @@ static int __init pcibios_init(void)
        for (hose = hose_head; hose; hose = hose->next)
                pcibios_scanbus(hose);
 
-       dma_debug_add_bus(&pci_bus_type);
-
        pci_initialized = 1;
 
        return 0;

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index ab5d9dd668d2fb2580e07881d43f4d4bb5dc3e6c..43f58632f1238e754a6ffc8b59b2282a73ee48da 100644 (file)
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -155,9 +155,6 @@ static int __init pci_iommu_init(void)
 {
        struct iommu_table_entry *p;
 
-#ifdef CONFIG_PCI
-       dma_debug_add_bus(&pci_bus_type);
-#endif
        x86_init.iommu.iommu_init();
 
        for (p = __iommu_table; p < __iommu_table_end; p++) {

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index c125d53033c69cafe42734c32935561547abbdba..7a02f94fd2316dca6498466b35ecfc8cc9041ec9 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -1667,7 +1667,7 @@ static int __init pci_driver_init(void)
        if (ret)
                return ret;
 #endif
-
+       dma_debug_add_bus(&pci_bus_type);
        return 0;
 }
 postcore_initcall(pci_driver_init);