2 files changed, 2 insertions, 4 deletions

diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
index 8926a2bd4a87..1d796e7c8199 100644
--- a/drivers/infiniband/core/fmr_pool.c
+++ b/drivers/infiniband/core/fmr_pool.c
@@ -301,7 +301,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd             *pd,
 
         {
                 struct ib_pool_fmr *fmr;
-                struct ib_fmr_attr attr = {
+                struct ib_fmr_attr fmr_attr = {
                         .max_pages  = params->max_pages_per_fmr,
                         .max_maps   = pool->max_remaps,
                         .page_shift = params->page_shift
@@ -321,7 +321,7 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd             *pd,
                         fmr->ref_count        = 0;
                         INIT_HLIST_NODE(&fmr->cache_node);
 
-                        fmr->fmr = ib_alloc_fmr(pd, params->access, &attr);
+                        fmr->fmr = ib_alloc_fmr(pd, params->access, &fmr_attr);
                         if (IS_ERR(fmr->fmr)) {
                                 printk(KERN_WARNING "fmr_create failed for FMR %d", i);
                                 kfree(fmr);
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 709323c14c5d..000c086bf2e9 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -714,8 +714,6 @@ int ib_device_register_sysfs(struct ib_device *device)
                 if (ret)
                         goto err_put;
         } else {
-                int i;
-
                 for (i = 1; i <= device->phys_port_cnt; ++i) {
                         ret = add_port(device, i);
                         if (ret)