From: Julien Grall <julien.grall@citrix.com>
Date: Thu, 29 Oct 2015 11:20:38 +0000 (+0100)
Subject: grant_table: avoid to shadow "frame" in __gnttab_map_grant_ref
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2334
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5a722f89d30093cf5e1d2bc536fd73d6f9e5513f;p=xen.git

grant_table: avoid to shadow "frame" in __gnttab_map_grant_ref

The variable "frame" is declared twice within the function
__gntab_map_grant_ref.  This makes the code quite confusing to read.

The second definition is not useful as the first one is never used
until then. So drop it.

Signed-off-by: Julien Grall <julien.grall@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index c92abdaaae..5d52d1e4bb 100644
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -826,7 +826,6 @@ __gnttab_map_grant_ref(
 
         if ( !act->pin )
         {
-            unsigned long frame;
             unsigned long gfn = rgt->gt_version == 1 ?
                                 shared_entry_v1(rgt, op->ref).frame :
                                 shared_entry_v2(rgt, op->ref).full_page.frame;