1 files changed, 2 insertions, 11 deletions

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 3f55d18a3791..2c98533a0203 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -1296,7 +1296,6 @@ ssize_t ib_uverbs_destroy_cq(struct ib_uverbs_file *file,
         struct ib_uobject               *uobj;
         struct ib_cq                    *cq;
         struct ib_ucq_object            *obj;
-        struct ib_uverbs_event_queue    *ev_queue;
         int                              ret = -EINVAL;
 
         if (copy_from_user(&cmd, buf, sizeof cmd))
@@ -1313,7 +1312,6 @@ ssize_t ib_uverbs_destroy_cq(struct ib_uverbs_file *file,
          */
         uverbs_uobject_get(uobj);
         cq      = uobj->object;
-        ev_queue = cq->cq_context;
         obj     = container_of(cq->uobject, struct ib_ucq_object, uobject);
 
         memset(&resp, 0, sizeof(resp));
@@ -1935,7 +1933,8 @@ static int modify_qp(struct ib_uverbs_file *file,
                 goto out;
         }
 
-        if (!rdma_is_port_valid(qp->device, cmd->base.port_num)) {
+        if ((cmd->base.attr_mask & IB_QP_PORT) &&
+            !rdma_is_port_valid(qp->device, cmd->base.port_num)) {
                 ret = -EINVAL;
                 goto release_qp;
         }
@@ -2088,7 +2087,6 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file,
         struct ib_uverbs_destroy_qp      cmd;
         struct ib_uverbs_destroy_qp_resp resp;
         struct ib_uobject               *uobj;
-        struct ib_qp                    *qp;
         struct ib_uqp_object            *obj;
         int                              ret = -EINVAL;
 
@@ -2102,7 +2100,6 @@ ssize_t ib_uverbs_destroy_qp(struct ib_uverbs_file *file,
         if (IS_ERR(uobj))
                 return PTR_ERR(uobj);
 
-        qp  = uobj->object;
         obj = container_of(uobj, struct ib_uqp_object, uevent.uobject);
         /*
          * Make sure we don't free the memory in remove_commit as we still
@@ -3004,7 +3001,6 @@ int ib_uverbs_ex_destroy_wq(struct ib_uverbs_file *file,
 {
         struct ib_uverbs_ex_destroy_wq  cmd = {};
         struct ib_uverbs_ex_destroy_wq_resp     resp = {};
-        struct ib_wq                    *wq;
         struct ib_uobject               *uobj;
         struct ib_uwq_object            *obj;
         size_t required_cmd_sz;
@@ -3038,7 +3034,6 @@ int ib_uverbs_ex_destroy_wq(struct ib_uverbs_file *file,
         if (IS_ERR(uobj))
                 return PTR_ERR(uobj);
 
-        wq = uobj->object;
         obj = container_of(uobj, struct ib_uwq_object, uevent.uobject);
         /*
          * Make sure we don't free the memory in remove_commit as we still
@@ -3728,10 +3723,8 @@ ssize_t ib_uverbs_destroy_srq(struct ib_uverbs_file *file,
         struct ib_uverbs_destroy_srq      cmd;
         struct ib_uverbs_destroy_srq_resp resp;
         struct ib_uobject                *uobj;
-        struct ib_srq                    *srq;
         struct ib_uevent_object          *obj;
         int                               ret = -EINVAL;
-        enum ib_srq_type                  srq_type;
 
         if (copy_from_user(&cmd, buf, sizeof cmd))
                 return -EFAULT;
@@ -3741,9 +3734,7 @@ ssize_t ib_uverbs_destroy_srq(struct ib_uverbs_file *file,
         if (IS_ERR(uobj))
                 return PTR_ERR(uobj);
 
-        srq = uobj->object;
         obj = container_of(uobj, struct ib_uevent_object, uobject);
-        srq_type = srq->srq_type;
         /*
          * Make sure we don't free the memory in remove_commit as we still
          * needs the uobject memory to create the response.