iommu/amd: Remove amd_iommu_disabled check from amd_iommu_detect()

This check needs to happens later now, when all previously
enabled IOMMUs have been disabled.

Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 128f9665c326ada5a2a7169ea72263d61947a58c..5cc597b383c7208d69e83d8ec0646e936817d1b4 100644 (file)
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -2578,9 +2578,6 @@ int __init amd_iommu_detect(void)
        if (no_iommu || (iommu_detected && !gart_iommu_aperture))
                return -ENODEV;
 
-       if (amd_iommu_disabled)
-               return -ENODEV;
-
        ret = iommu_go_to_state(IOMMU_IVRS_DETECTED);
        if (ret)
                return ret;