From ff554db2d4ae159218c5394b458546638544daf4 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Fri, 9 Mar 2012 13:37:48 +0100 Subject: [PATCH] --- yaml --- r: 294817 b: refs/heads/master c: 6e930045abe51013ee3b47eaeb5aef4bc5a35218 h: refs/heads/master i: 294815: 22668e682b52c6ee2221642b4562cf924c8a3d48 v: v3 --- [refs] | 2 +- trunk/drivers/iommu/amd_iommu_init.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index b314199455e9..b8d80b9b488e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8704a1ba4751fc5ffe2289765cb7222b3a1e20d5 +refs/heads/master: 6e930045abe51013ee3b47eaeb5aef4bc5a35218 diff --git a/trunk/drivers/iommu/amd_iommu_init.c b/trunk/drivers/iommu/amd_iommu_init.c index 75653daf1de1..526652a7385d 100644 --- a/trunk/drivers/iommu/amd_iommu_init.c +++ b/trunk/drivers/iommu/amd_iommu_init.c @@ -358,8 +358,6 @@ static void iommu_disable(struct amd_iommu *iommu) */ static u8 * __init iommu_map_mmio_space(u64 address) { - u8 *ret; - if (!request_mem_region(address, MMIO_REGION_LENGTH, "amd_iommu")) { pr_err("AMD-Vi: Can not reserve memory region %llx for mmio\n", address); @@ -367,13 +365,7 @@ static u8 * __init iommu_map_mmio_space(u64 address) return NULL; } - ret = ioremap_nocache(address, MMIO_REGION_LENGTH); - if (ret != NULL) - return ret; - - release_mem_region(address, MMIO_REGION_LENGTH); - - return NULL; + return ioremap_nocache(address, MMIO_REGION_LENGTH); } static void __init iommu_unmap_mmio_space(struct amd_iommu *iommu)