AMD IOMMU: remove now unnecessary #ifdefs
The #ifdef's are no longer necessary when the iommu-api and the amd
iommu updates are merged together.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 881c68f..5113c08 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -426,7 +426,6 @@
iommu_queue_inv_iommu_pages(iommu, address, domid, 0, 1);
}
-#ifdef CONFIG_IOMMU_API
/*
* This function is used to flush the IO/TLB for a given protection domain
* on every IOMMU in the system
@@ -450,7 +449,6 @@
spin_unlock_irqrestore(&iommu->lock, flags);
}
}
-#endif
/****************************************************************************
*
@@ -516,7 +514,6 @@
return 0;
}
-#ifdef CONFIG_IOMMU_API
static void iommu_unmap_page(struct protection_domain *dom,
unsigned long bus_addr)
{
@@ -538,7 +535,6 @@
*pte = 0;
}
-#endif
/*
* This function checks if a specific unity mapping entry is needed for
@@ -723,7 +719,6 @@
return id;
}
-#ifdef CONFIG_IOMMU_API
static void domain_id_free(int id)
{
unsigned long flags;
@@ -733,7 +728,6 @@
__clear_bit(id, amd_iommu_pd_alloc_bitmap);
write_unlock_irqrestore(&amd_iommu_devtable_lock, flags);
}
-#endif
/*
* Used to reserve address ranges in the aperture (e.g. for exclusion
@@ -1702,9 +1696,7 @@
/* Make the driver finally visible to the drivers */
dma_ops = &amd_iommu_dma_ops;
-#ifdef CONFIG_IOMMU_API
register_iommu(&amd_iommu_ops);
-#endif
bus_register_notifier(&pci_bus_type, &device_nb);
@@ -1732,8 +1724,6 @@
*
*****************************************************************************/
-#ifdef CONFIG_IOMMU_API
-
static void cleanup_domain(struct protection_domain *domain)
{
unsigned long flags;
@@ -1944,4 +1934,3 @@
.iova_to_phys = amd_iommu_iova_to_phys,
};
-#endif