[POWERPC] pasemi: Add function engine management functions to dma_lib

[linux-block.git] / arch / powerpc / platforms / pasemi / iommu.c

diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c
index a1111b5c6cb467fbdabdd03c3f57ed52b9fe9347..5803f11c77fc07cc961f2610a9f0ec1b9f7aeef7 100644 (file)
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -182,8 +182,10 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev)
         * CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE at build time.
         */
        if (dev->vendor == 0x1959 && dev->device == 0xa007 &&
-           !firmware_has_feature(FW_FEATURE_LPAR))
+           !firmware_has_feature(FW_FEATURE_LPAR)) {
                dev->dev.archdata.dma_ops = &dma_direct_ops;
+               return;
+       }
 #endif
 
        dev->dev.archdata.dma_data = &iommu_table_iobmap;
@@ -192,7 +194,7 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev)
 static void pci_dma_bus_setup_null(struct pci_bus *b) { }
 static void pci_dma_dev_setup_null(struct pci_dev *d) { }
 
-int iob_init(struct device_node *dn)
+int __init iob_init(struct device_node *dn)
 {
        unsigned long tmp;
        u32 regword;
@@ -238,7 +240,7 @@ int iob_init(struct device_node *dn)
 
 
 /* These are called very early. */
-void iommu_init_early_pasemi(void)
+void __init iommu_init_early_pasemi(void)
 {
        int iommu_off;