IB/sa: simplify return code logic for ib_nl_send_msg()

rdma_nl_multicast() returns either negative error code
or zero if succeeded. Remove unnecessary ret code checks
and reassignments.

Reviewed-by: Kaike Wan <kaike.wan@intel.com>
Signed-off-by: Alex Estrin <alex.estrin@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

1 files changed, 2 insertions, 11 deletions

diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index 19e1833e13fc..a5e76d432d3f 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -835,7 +835,6 @@ static int ib_nl_send_msg(struct ib_sa_query *query, gfp_t gfp_mask)
         struct sk_buff *skb = NULL;
         struct nlmsghdr *nlh;
         void *data;
-        int ret = 0;
         struct ib_sa_mad *mad;
         int len;
 
@@ -862,13 +861,7 @@ static int ib_nl_send_msg(struct ib_sa_query *query, gfp_t gfp_mask)
         /* Repair the nlmsg header length */
         nlmsg_end(skb, nlh);
 
-        ret = rdma_nl_multicast(skb, RDMA_NL_GROUP_LS, gfp_mask);
-        if (!ret)
-                ret = len;
-        else
-                ret = 0;
-
-        return ret;
+        return rdma_nl_multicast(skb, RDMA_NL_GROUP_LS, gfp_mask);
 }
 
 static int ib_nl_make_request(struct ib_sa_query *query, gfp_t gfp_mask)
@@ -891,14 +884,12 @@ static int ib_nl_make_request(struct ib_sa_query *query, gfp_t gfp_mask)
         spin_unlock_irqrestore(&ib_nl_request_lock, flags);
 
         ret = ib_nl_send_msg(query, gfp_mask);
-        if (ret <= 0) {
+        if (ret) {
                 ret = -EIO;
                 /* Remove the request */
                 spin_lock_irqsave(&ib_nl_request_lock, flags);
                 list_del(&query->list);
                 spin_unlock_irqrestore(&ib_nl_request_lock, flags);
-        } else {
-                ret = 0;
         }
 
         return ret;