2 files changed, 8 insertions, 7 deletions

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index e39f9dbf297b..01068987809d 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -65,8 +65,8 @@ config AMD_IOMMU_STATS
           If unsure, say N.
 
 config AMD_IOMMU_V2
-        tristate "AMD IOMMU Version 2 driver (EXPERIMENTAL)"
-        depends on AMD_IOMMU && PROFILING && EXPERIMENTAL
+        tristate "AMD IOMMU Version 2 driver"
+        depends on AMD_IOMMU && PROFILING
         select MMU_NOTIFIER
         ---help---
           This option enables support for the AMD IOMMUv2 features of the IOMMU
@@ -119,8 +119,8 @@ config INTEL_IOMMU_FLOPPY_WA
           16MiB to make floppy (an ISA device) work.
 
 config IRQ_REMAP
-        bool "Support for Interrupt Remapping (EXPERIMENTAL)"
-        depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL
+        bool "Support for Interrupt Remapping"
+        depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI
         select DMAR_TABLE
         ---help---
           Supports Interrupt remapping for IO-APIC and MSI devices.
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index fc178893789a..f08dbcd2f175 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -19,6 +19,7 @@
 
 #define pr_fmt(fmt)     "%s(): " fmt, __func__
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
@@ -1176,9 +1177,9 @@ static int tegra_smmu_probe(struct platform_device *pdev)
                 res = platform_get_resource(pdev, IORESOURCE_MEM, i);
                 if (!res)
                         return -ENODEV;
-                smmu->regs[i] = devm_request_and_ioremap(&pdev->dev, res);
-                if (!smmu->regs[i])
-                        return -EBUSY;
+                smmu->regs[i] = devm_ioremap_resource(&pdev->dev, res);
+                if (IS_ERR(smmu->regs[i]))
+                        return PTR_ERR(smmu->regs[i]);
         }
 
         err = of_get_dma_window(dev->of_node, NULL, 0, NULL, &base, &size);