IB/rxe: change the function rxe_av_fill_ip_info to void

The function rxe_av_fill_ip_info always returns 0. So the function
type is changed to void.

CC: Srinivas Eeda <srinivas.eeda@oracle.com>
CC: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/sw/rxe/rxe_av.c b/drivers/infiniband/sw/rxe/rxe_av.c
index 9662a774971332f23936295bbf796d5feec4a1c2..c33aa41ae68c880ae291bdff67cd7e586eeb919e 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_av.c
+++ b/drivers/infiniband/sw/rxe/rxe_av.c
@@ -69,7 +69,7 @@ void rxe_av_to_attr(struct rxe_av *av, struct rdma_ah_attr *attr)
        rdma_ah_set_port_num(attr, av->port_num);
 }
 
-int rxe_av_fill_ip_info(struct rxe_dev *rxe,
+void rxe_av_fill_ip_info(struct rxe_dev *rxe,
                        struct rxe_av *av,
                        struct rdma_ah_attr *attr,
                        struct ib_gid_attr *sgid_attr,
@@ -78,8 +78,6 @@ int rxe_av_fill_ip_info(struct rxe_dev *rxe,
        rdma_gid2ip(&av->sgid_addr._sockaddr, sgid);
        rdma_gid2ip(&av->dgid_addr._sockaddr, &rdma_ah_read_grh(attr)->dgid);
        av->network_type = ib_gid_to_network_type(sgid_attr->gid_type, sgid);
-
-       return 0;
 }
 
 struct rxe_av *rxe_get_av(struct rxe_pkt_info *pkt)

diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
index 03d4bd5230fc518a56ad44d2cc77159ccbdc2305..6a355103e452eaa40dc06d527ee545d38757969b 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_loc.h
+++ b/drivers/infiniband/sw/rxe/rxe_loc.h
@@ -43,7 +43,7 @@ void rxe_av_from_attr(u8 port_num, struct rxe_av *av,
 
 void rxe_av_to_attr(struct rxe_av *av, struct rdma_ah_attr *attr);
 
-int rxe_av_fill_ip_info(struct rxe_dev *rxe,
+void rxe_av_fill_ip_info(struct rxe_dev *rxe,
                        struct rxe_av *av,
                        struct rdma_ah_attr *attr,
                        struct ib_gid_attr *sgid_attr,

diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index b2cc67b451eb9c4440033fe8a2e85fcd32cd011a..48bf4ad1e9dfe9f0938150fdf27c60a66f80fafb 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -272,11 +272,11 @@ static int rxe_init_av(struct rxe_dev *rxe, struct rdma_ah_attr *attr,
        }
 
        rxe_av_from_attr(rdma_ah_get_port_num(attr), av, attr);
-       err = rxe_av_fill_ip_info(rxe, av, attr, &sgid_attr, &sgid);
+       rxe_av_fill_ip_info(rxe, av, attr, &sgid_attr, &sgid);
 
        if (sgid_attr.ndev)
                dev_put(sgid_attr.ndev);
-       return err;
+       return 0;
 }
 
 static struct ib_ah *rxe_create_ah(struct ib_pd *ibpd,