Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / powerpc / platforms / pasemi / iommu.c

diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c
index 1f9fb2c577613c64335f4c61b348efc6701de3a2..14943ef01918ac7443657be39798e94d9ba69527 100644 (file)
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -156,20 +156,12 @@ static void iommu_table_iobmap_setup(void)
 
 static void pci_dma_bus_setup_pasemi(struct pci_bus *bus)
 {
-       struct device_node *dn;
-
        pr_debug("pci_dma_bus_setup, bus %p, bus->self %p\n", bus, bus->self);
 
        if (!iommu_table_iobmap_inited) {
                iommu_table_iobmap_inited = 1;
                iommu_table_iobmap_setup();
        }
-
-       dn = pci_bus_to_OF_node(bus);
-
-       if (dn)
-               PCI_DN(dn)->iommu_table = &iommu_table_iobmap;
-
 }
 
 
@@ -192,9 +184,6 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev)
        set_iommu_table_base(&dev->dev, &iommu_table_iobmap);
 }
 
-static void pci_dma_bus_setup_null(struct pci_bus *b) { }
-static void pci_dma_dev_setup_null(struct pci_dev *d) { }
-
 int __init iob_init(struct device_node *dn)
 {
        unsigned long tmp;
@@ -251,14 +240,8 @@ void __init iommu_init_early_pasemi(void)
        iommu_off = of_chosen &&
                        of_get_property(of_chosen, "linux,iommu-off", NULL);
 #endif
-       if (iommu_off) {
-               /* Direct I/O, IOMMU off */
-               ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_null;
-               ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_null;
-               set_pci_dma_ops(&dma_direct_ops);
-
+       if (iommu_off)
                return;
-       }
 
        iob_init(NULL);