1 files changed, 5 insertions, 18 deletions

diff --git a/net/rds/iw.c b/net/rds/iw.c
index 576f1825fc55..f4a9fff829e0 100644
--- a/net/rds/iw.c
+++ b/net/rds/iw.c
@@ -60,30 +60,20 @@ LIST_HEAD(iw_nodev_conns);
 static void rds_iw_add_one(struct ib_device *device)
 {
         struct rds_iw_device *rds_iwdev;
-        struct ib_device_attr *dev_attr;
 
         /* Only handle iwarp devices */
         if (device->node_type != RDMA_NODE_RNIC)
                 return;
 
-        dev_attr = kmalloc(sizeof *dev_attr, GFP_KERNEL);
-        if (!dev_attr)
-                return;
-
-        if (ib_query_device(device, dev_attr)) {
-                rdsdebug("Query device failed for %s\n", device->name);
-                goto free_attr;
-        }
-
         rds_iwdev = kmalloc(sizeof *rds_iwdev, GFP_KERNEL);
         if (!rds_iwdev)
-                goto free_attr;
+                return;
 
         spin_lock_init(&rds_iwdev->spinlock);
 
-        rds_iwdev->dma_local_lkey = !!(dev_attr->device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY);
-        rds_iwdev->max_wrs = dev_attr->max_qp_wr;
-        rds_iwdev->max_sge = min(dev_attr->max_sge, RDS_IW_MAX_SGE);
+        rds_iwdev->dma_local_lkey = !!(device->attrs.device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY);
+        rds_iwdev->max_wrs = device->attrs.max_qp_wr;
+        rds_iwdev->max_sge = min(device->attrs.max_sge, RDS_IW_MAX_SGE);
 
         rds_iwdev->dev = device;
         rds_iwdev->pd = ib_alloc_pd(device);
@@ -111,8 +101,7 @@ static void rds_iw_add_one(struct ib_device *device)
         list_add_tail(&rds_iwdev->list, &rds_iw_devices);
 
         ib_set_client_data(device, &rds_iw_client, rds_iwdev);
-
-        goto free_attr;
+        return;
 
 err_mr:
         if (rds_iwdev->mr)
@@ -121,8 +110,6 @@ err_pd:
         ib_dealloc_pd(rds_iwdev->pd);
 free_dev:
         kfree(rds_iwdev);
-free_attr:
-        kfree(dev_attr);
 }
 
 static void rds_iw_remove_one(struct ib_device *device, void *client_data)