iommu/irq_remapping: Change variable disable_irq_remap to be static

[firefly-linux-kernel-4.4.55.git] / drivers / iommu / amd_iommu_init.c

diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 970979ecbebb3fa5e4b84c63945ac7ed95a7176a..e430dc8dffdffdfa3056054c1b4e40933b4ffd45 100644 (file)
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -2014,9 +2014,6 @@ static bool detect_ivrs(void)
        /* Make sure ACS will be enabled during PCI probe */
        pci_request_acs();
 
-       if (!disable_irq_remap)
-               amd_iommu_irq_remap = true;
-
        return true;
 }
 
@@ -2123,8 +2120,7 @@ static int __init iommu_go_to_state(enum iommu_init_state state)
 #ifdef CONFIG_IRQ_REMAP
 int __init amd_iommu_prepare(void)
 {
-       if (!amd_iommu_irq_remap)
-               return -1;
+       amd_iommu_irq_remap = true;
 
        return iommu_go_to_state(IOMMU_ACPI_FINISHED);
 }