Signed-off-by: Daniel Axtens <d...@axtens.net>
---
arch/powerpc/include/asm/machdep.h | 1 -
arch/powerpc/include/asm/pci-bridge.h | 9 ---------
arch/powerpc/kernel/pci-common.c | 5 ++++-
arch/powerpc/sysdev/dart_iommu.c | 2 --
4 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/arch/powerpc/include/asm/machdep.h
b/arch/powerpc/include/asm/machdep.h
index dfc8d2b..2f7b319 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -103,7 +103,6 @@ struct machdep_calls {
#endif
#endif /* CONFIG_PPC64 */
- void (*pci_dma_dev_setup)(struct pci_dev *dev);
void (*pci_dma_bus_setup)(struct pci_bus *bus);
/* Platform set_dma_mask and dma_get_required_mask overrides */
diff --git a/arch/powerpc/include/asm/pci-bridge.h
b/arch/powerpc/include/asm/pci-bridge.h
index b5d8631..e578f67 100644
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -280,15 +280,6 @@ static inline int pcibios_vaddr_is_ioport(void __iomem
*address)
/*
* Shims to prefer pci_controller version over ppc_md where available.
*/
-static inline void dma_dev_setup(struct pci_dev *dev)
-{
- struct pci_controller *hose = pci_bus_to_host(dev->bus);
-
- if (hose->controller_ops.dma_dev_setup)
- hose->controller_ops.dma_dev_setup(dev);
- else if (ppc_md.pci_dma_dev_setup)
- ppc_md.pci_dma_dev_setup(dev);
-}
static inline void dma_bus_setup(struct pci_bus *bus)
{
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index a61ecb4..433b387 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -962,6 +962,7 @@ void pcibios_setup_bus_self(struct pci_bus *bus)
static void pcibios_setup_device(struct pci_dev *dev)
{
+ struct pci_controller *hose;
/* Fixup NUMA node as it may not be setup yet by the generic
* code and is needed by the DMA init
*/
@@ -972,7 +973,9 @@ static void pcibios_setup_device(struct pci_dev *dev)
set_dma_offset(&dev->dev, PCI_DRAM_OFFSET);
/* Additional platform DMA/iommu setup */
- dma_dev_setup(dev);
+ hose = pci_bus_to_host(dev->bus);
+ if (hose->controller_ops.dma_dev_setup)
+ hose->controller_ops.dma_dev_setup(dev);
/* Read default IRQs and fixup if necessary */
pci_read_irq_line(dev);
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index 120e96a..ca38b1e 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -399,7 +399,6 @@ void __init iommu_init_early_dart(struct pci_controller_ops
*controller_ops)
controller_ops->dma_dev_setup = pci_dma_dev_setup_dart;
controller_ops->dma_bus_setup = pci_dma_bus_setup_dart;
} else {
- ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_dart;
ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_dart;
}
/* Setup pci_dma ops */
@@ -412,7 +411,6 @@ void __init iommu_init_early_dart(struct pci_controller_ops
*controller_ops)
controller_ops->dma_dev_setup = NULL;
controller_ops->dma_bus_setup = NULL;
}
- ppc_md.pci_dma_dev_setup = NULL;
ppc_md.pci_dma_bus_setup = NULL;
/* Setup pci_dma ops */
--
2.1.4
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
