Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8651194 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Bjorn Helgaas
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
parent d6488ac1

arch/powerpc/kernel/dma.c

+0 −3
Original line number Diff line number Diff line
@@ -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

arch/sh/drivers/pci/pci.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/pci-dma.c

+0 −3
Original line number Diff line number Diff line
@@ -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++) {

drivers/pci/pci-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -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);