RDMA/rxe: Fix style warnings

Fixed several minor checkpatch warnings in existing rxe source.

Link: https://lore.kernel.org/r/20200820224638.3212-3-rpearson@hpe.com
Signed-off-by: Bob Pearson <rpearson@hpe.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/sw/rxe/rxe_comp.c b/drivers/infiniband/sw/rxe/rxe_comp.c
index 4bc8870..8e28ebb 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_comp.c
+++ b/drivers/infiniband/sw/rxe/rxe_comp.c
@@ -690,9 +690,8 @@ int rxe_completer(void *arg)
                         */
 
                        /* there is nothing to retry in this case */
-                       if (!wqe || (wqe->state == wqe_state_posted)) {
+                       if (!wqe || (wqe->state == wqe_state_posted))
                                goto exit;
-                       }
 
                        /* if we've started a retry, don't start another
                         * retry sequence, unless this is a timeout.

diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
index 0c38086..80abd41 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -120,7 +120,7 @@ static struct dst_entry *rxe_find_route6(struct net_device *ndev,
        ndst = ipv6_stub->ipv6_dst_lookup_flow(sock_net(recv_sockets.sk6->sk),
                                               recv_sockets.sk6->sk, &fl6,
                                               NULL);
-       if (unlikely(IS_ERR(ndst))) {
+       if (IS_ERR(ndst)) {
                pr_err_ratelimited("no route to %pI6\n", daddr);
                return NULL;
        }

diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c
index 6c11c3a..3562b38 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_qp.c
+++ b/drivers/infiniband/sw/rxe/rxe_qp.c
@@ -628,9 +628,8 @@ int rxe_qp_from_attr(struct rxe_qp *qp, struct ib_qp_attr *attr, int mask,
        if (mask & IB_QP_QKEY)
                qp->attr.qkey = attr->qkey;
 
-       if (mask & IB_QP_AV) {
+       if (mask & IB_QP_AV)
                rxe_init_av(&attr->ah_attr, &qp->pri_av);
-       }
 
        if (mask & IB_QP_ALT_PATH) {
                rxe_init_av(&attr->alt_ah_attr, &qp->alt_av);

diff --git a/drivers/infiniband/sw/rxe/rxe_task.h b/drivers/infiniband/sw/rxe/rxe_task.h
index 08ff42d..66af2f9 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_task.h
+++ b/drivers/infiniband/sw/rxe/rxe_task.h
@@ -60,7 +60,7 @@ struct rxe_task {
 /*
  * init rxe_task structure
  *     arg  => parameter to pass to fcn
- *     fcn  => function to call until it returns != 0
+ *     func => function to call until it returns != 0
  */
 int rxe_init_task(void *obj, struct rxe_task *task,
                  void *arg, int (*func)(void *), char *name);

diff --git a/include/uapi/rdma/rdma_user_rxe.h b/include/uapi/rdma/rdma_user_rxe.h
index aae2e69..d8f2e0e 100644 (file)
--- a/include/uapi/rdma/rdma_user_rxe.h
+++ b/include/uapi/rdma/rdma_user_rxe.h
@@ -99,8 +99,8 @@ struct rxe_send_wr {
                                struct ib_mr *mr;
                                __aligned_u64 reserved;
                        };
-                       __u32        key;
-                       __u32        access;
+                       __u32        key;
+                       __u32        access;
                } reg;
        } wr;
 };
@@ -112,7 +112,7 @@ struct rxe_sge {
 };
 
 struct mminfo {
-       __aligned_u64           offset;
+       __aligned_u64           offset;
        __u32                   size;
        __u32                   pad;
 };