aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Romanovsky <leonro@mellanox.com>2018-10-11 10:30:04 -0400
committerDoug Ledford <dledford@redhat.com>2018-10-16 13:34:01 -0400
commit9549c2bd094f0f54b8827d64886f5b1de370dff3 (patch)
tree97ca18914f3b0b22336963c7dc5d3560f5031d1d
parentd6f9125207902ace40d36d6571cda251b43a8f95 (diff)
RDMA/core: Align multiple functions to kernel coding style
This patch changes the small number of functions to be aligned to kernel coding style. It is needed to minimize the diffstat of the following patch. It doesn't change any functionality. Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
-rw-r--r--drivers/infiniband/core/addr.c3
-rw-r--r--drivers/infiniband/core/sa.h10
-rw-r--r--include/rdma/ib_addr.h3
-rw-r--r--include/rdma/ib_sa.h36
4 files changed, 21 insertions, 31 deletions
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 07e0ffe74a8a..b6f7cde36c2d 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -662,8 +662,7 @@ int rdma_resolve_ip(struct sockaddr *src_addr, const struct sockaddr *dst_addr,
662 struct rdma_dev_addr *addr, int timeout_ms, 662 struct rdma_dev_addr *addr, int timeout_ms,
663 void (*callback)(int status, struct sockaddr *src_addr, 663 void (*callback)(int status, struct sockaddr *src_addr,
664 struct rdma_dev_addr *addr, void *context), 664 struct rdma_dev_addr *addr, void *context),
665 bool resolve_by_gid_attr, 665 bool resolve_by_gid_attr, void *context)
666 void *context)
667{ 666{
668 struct sockaddr *src_in, *dst_in; 667 struct sockaddr *src_in, *dst_in;
669 struct addr_req *req; 668 struct addr_req *req;
diff --git a/drivers/infiniband/core/sa.h b/drivers/infiniband/core/sa.h
index b1d4bbf4ce5c..57d4496f6720 100644
--- a/drivers/infiniband/core/sa.h
+++ b/drivers/infiniband/core/sa.h
@@ -49,16 +49,14 @@ static inline void ib_sa_client_put(struct ib_sa_client *client)
49} 49}
50 50
51int ib_sa_mcmember_rec_query(struct ib_sa_client *client, 51int ib_sa_mcmember_rec_query(struct ib_sa_client *client,
52 struct ib_device *device, u8 port_num, 52 struct ib_device *device, u8 port_num, u8 method,
53 u8 method,
54 struct ib_sa_mcmember_rec *rec, 53 struct ib_sa_mcmember_rec *rec,
55 ib_sa_comp_mask comp_mask, 54 ib_sa_comp_mask comp_mask, int timeout_ms,
56 int timeout_ms, gfp_t gfp_mask, 55 gfp_t gfp_mask,
57 void (*callback)(int status, 56 void (*callback)(int status,
58 struct ib_sa_mcmember_rec *resp, 57 struct ib_sa_mcmember_rec *resp,
59 void *context), 58 void *context),
60 void *context, 59 void *context, struct ib_sa_query **sa_query);
61 struct ib_sa_query **sa_query);
62 60
63int mcast_init(void); 61int mcast_init(void);
64void mcast_cleanup(void); 62void mcast_cleanup(void);
diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index e09eca91eb18..eebbe63b530c 100644
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -102,8 +102,7 @@ int rdma_resolve_ip(struct sockaddr *src_addr, const struct sockaddr *dst_addr,
102 struct rdma_dev_addr *addr, int timeout_ms, 102 struct rdma_dev_addr *addr, int timeout_ms,
103 void (*callback)(int status, struct sockaddr *src_addr, 103 void (*callback)(int status, struct sockaddr *src_addr,
104 struct rdma_dev_addr *addr, void *context), 104 struct rdma_dev_addr *addr, void *context),
105 bool resolve_by_gid_attr, 105 bool resolve_by_gid_attr, void *context);
106 void *context);
107 106
108void rdma_addr_cancel(struct rdma_dev_addr *addr); 107void rdma_addr_cancel(struct rdma_dev_addr *addr);
109 108
diff --git a/include/rdma/ib_sa.h b/include/rdma/ib_sa.h
index b6ddf2a1b9d8..95ce625a49e3 100644
--- a/include/rdma/ib_sa.h
+++ b/include/rdma/ib_sa.h
@@ -449,28 +449,23 @@ struct ib_sa_query;
449 449
450void ib_sa_cancel_query(int id, struct ib_sa_query *query); 450void ib_sa_cancel_query(int id, struct ib_sa_query *query);
451 451
452int ib_sa_path_rec_get(struct ib_sa_client *client, 452int ib_sa_path_rec_get(struct ib_sa_client *client, struct ib_device *device,
453 struct ib_device *device, u8 port_num, 453 u8 port_num, struct sa_path_rec *rec,
454 struct sa_path_rec *rec, 454 ib_sa_comp_mask comp_mask, int timeout_ms,
455 ib_sa_comp_mask comp_mask, 455 gfp_t gfp_mask,
456 int timeout_ms, gfp_t gfp_mask, 456 void (*callback)(int status, struct sa_path_rec *resp,
457 void (*callback)(int status,
458 struct sa_path_rec *resp,
459 void *context), 457 void *context),
460 void *context, 458 void *context, struct ib_sa_query **query);
461 struct ib_sa_query **query);
462 459
463int ib_sa_service_rec_query(struct ib_sa_client *client, 460int ib_sa_service_rec_query(struct ib_sa_client *client,
464 struct ib_device *device, u8 port_num, 461 struct ib_device *device, u8 port_num, u8 method,
465 u8 method, 462 struct ib_sa_service_rec *rec,
466 struct ib_sa_service_rec *rec, 463 ib_sa_comp_mask comp_mask, int timeout_ms,
467 ib_sa_comp_mask comp_mask, 464 gfp_t gfp_mask,
468 int timeout_ms, gfp_t gfp_mask, 465 void (*callback)(int status,
469 void (*callback)(int status, 466 struct ib_sa_service_rec *resp,
470 struct ib_sa_service_rec *resp, 467 void *context),
471 void *context), 468 void *context, struct ib_sa_query **sa_query);
472 void *context,
473 struct ib_sa_query **sa_query);
474 469
475struct ib_sa_multicast { 470struct ib_sa_multicast {
476 struct ib_sa_mcmember_rec rec; 471 struct ib_sa_mcmember_rec rec;
@@ -577,8 +572,7 @@ int ib_sa_guid_info_rec_query(struct ib_sa_client *client,
577 void (*callback)(int status, 572 void (*callback)(int status,
578 struct ib_sa_guidinfo_rec *resp, 573 struct ib_sa_guidinfo_rec *resp,
579 void *context), 574 void *context),
580 void *context, 575 void *context, struct ib_sa_query **sa_query);
581 struct ib_sa_query **sa_query);
582 576
583bool ib_sa_sendonly_fullmem_support(struct ib_sa_client *client, 577bool ib_sa_sendonly_fullmem_support(struct ib_sa_client *client,
584 struct ib_device *device, 578 struct ib_device *device,