Skip to content

Commit

Permalink
iommu/vt-d: Change iommu_enable/disable_translation to return void
Browse files Browse the repository at this point in the history
Simplify error handling path by changing iommu_{enable|disable}_translation
to return void.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
  • Loading branch information
Jiang Liu authored and Joerg Roedel committed Jul 23, 2014
1 parent 8594d83 commit 2a41cce
Showing 1 changed file with 5 additions and 13 deletions.
18 changes: 5 additions & 13 deletions drivers/iommu/intel-iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1389,7 +1389,7 @@ static void iommu_disable_protect_mem_regions(struct intel_iommu *iommu)
raw_spin_unlock_irqrestore(&iommu->register_lock, flags);
}

static int iommu_enable_translation(struct intel_iommu *iommu)
static void iommu_enable_translation(struct intel_iommu *iommu)
{
u32 sts;
unsigned long flags;
Expand All @@ -1403,10 +1403,9 @@ static int iommu_enable_translation(struct intel_iommu *iommu)
readl, (sts & DMA_GSTS_TES), sts);

raw_spin_unlock_irqrestore(&iommu->register_lock, flags);
return 0;
}

static int iommu_disable_translation(struct intel_iommu *iommu)
static void iommu_disable_translation(struct intel_iommu *iommu)
{
u32 sts;
unsigned long flag;
Expand All @@ -1420,7 +1419,6 @@ static int iommu_disable_translation(struct intel_iommu *iommu)
readl, (!(sts & DMA_GSTS_TES)), sts);

raw_spin_unlock_irqrestore(&iommu->register_lock, flag);
return 0;
}


Expand Down Expand Up @@ -2860,11 +2858,7 @@ static int __init init_dmars(void)

iommu->flush.flush_context(iommu, 0, 0, 0, DMA_CCMD_GLOBAL_INVL);
iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);

ret = iommu_enable_translation(iommu);
if (ret)
goto free_iommu;

iommu_enable_translation(iommu);
iommu_disable_protect_mem_regions(iommu);
}

Expand Down Expand Up @@ -3578,10 +3572,8 @@ static int init_iommu_hw(void)

iommu->flush.flush_context(iommu, 0, 0, 0,
DMA_CCMD_GLOBAL_INVL);
iommu->flush.flush_iotlb(iommu, 0, 0, 0,
DMA_TLB_GLOBAL_FLUSH);
if (iommu_enable_translation(iommu))
return 1;
iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);
iommu_enable_translation(iommu);
iommu_disable_protect_mem_regions(iommu);
}

Expand Down

0 comments on commit 2a41cce

Please sign in to comment.