[Xen-devel] [PATCH] iommu: Eliminate an odd local variable

[Andrii Anisov <andrii.anisov@xxxxxxxxx>]

From: Andrii Anisov <andrii_anisov@xxxxxxxx>

Wipe out excessive lines from an iommu_unmap(), and align it with an
iommu_map() code.

Signed-off-by: Andrii Anisov <andrii_anisov@xxxxxxxx>
---
 xen/drivers/passthrough/iommu.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c
index bd1af35..b31a1a9 100644
--- a/xen/drivers/passthrough/iommu.c
+++ b/xen/drivers/passthrough/iommu.c
@@ -385,19 +385,16 @@ int iommu_unmap(struct domain *d, dfn_t dfn, unsigned int 
page_order,
 
     for ( i = 0; i < (1ul << page_order); i++ )
     {
-        int err = hd->platform_ops->unmap_page(d, dfn_add(dfn, i),
+        rc = hd->platform_ops->unmap_page(d, dfn_add(dfn, i),
                                                flush_flags);
 
-        if ( likely(!err) )
+        if ( likely(!rc) )
             continue;
 
         if ( !d->is_shutting_down && printk_ratelimit() )
             printk(XENLOG_ERR
                    "d%d: IOMMU unmapping dfn %"PRI_dfn" failed: %d\n",
-                   d->domain_id, dfn_x(dfn_add(dfn, i)), err);
-
-        if ( !rc )
-            rc = err;
+                   d->domain_id, dfn_x(dfn_add(dfn, i)), rc);
 
         if ( !is_hardware_domain(d) )
         {
-- 
2.7.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel