lkml.org 
[lkml]   [2014]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RFC Patch V1 6/9] iommu/irq_remapping: Refine function irq_remapping_prepare() for maintenance
Date
Do not directly assign intel_irq_remap_ops to remap_ops.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
---
drivers/iommu/irq_remapping.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
index 2d75f0d69b76..a28001af4e15 100644
--- a/drivers/iommu/irq_remapping.c
+++ b/drivers/iommu/irq_remapping.c
@@ -85,15 +85,15 @@ int __init irq_remapping_prepare(void)
if (disable_irq_remap)
return -ENOSYS;

- remap_ops = &intel_irq_remap_ops;
-
-#ifdef CONFIG_AMD_IOMMU
- if (amd_iommu_irq_ops.prepare() == 0) {
+ if (intel_irq_remap_ops.prepare() == 0)
+ remap_ops = &intel_irq_remap_ops;
+ else if (IS_ENABLED(CONFIG_AMD_IOMMU) &&
+ amd_iommu_irq_ops.prepare() == 0)
remap_ops = &amd_iommu_irq_ops;
- return 0;
- }
-#endif
- return remap_ops->prepare();
+ else
+ return -ENOSYS;
+
+ return 0;
}

int __init irq_remapping_enable(void)
--
1.7.10.4


\
 
 \ /
  Last update: 2014-12-10 08:21    [W:0.070 / U:5.916 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site