Skip to content

Commit

Permalink
RDMA/core: Align multiple functions to kernel coding style
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Doug Ledford <[email protected]>
  • Loading branch information
Leon Romanovsky authored and dledford committed Oct 16, 2018
1 parent d6f9125 commit 9549c2b
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 31 deletions.
3 changes: 1 addition & 2 deletions drivers/infiniband/core/addr.c
Original file line number Diff line number Diff line change
Expand Up @@ -662,8 +662,7 @@ int rdma_resolve_ip(struct sockaddr *src_addr, const struct sockaddr *dst_addr,
struct rdma_dev_addr *addr, int timeout_ms,
void (*callback)(int status, struct sockaddr *src_addr,
struct rdma_dev_addr *addr, void *context),
bool resolve_by_gid_attr,
void *context)
bool resolve_by_gid_attr, void *context)
{
struct sockaddr *src_in, *dst_in;
struct addr_req *req;
Expand Down
10 changes: 4 additions & 6 deletions drivers/infiniband/core/sa.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,14 @@ static inline void ib_sa_client_put(struct ib_sa_client *client)
}

int ib_sa_mcmember_rec_query(struct ib_sa_client *client,
struct ib_device *device, u8 port_num,
u8 method,
struct ib_device *device, u8 port_num, u8 method,
struct ib_sa_mcmember_rec *rec,
ib_sa_comp_mask comp_mask,
int timeout_ms, gfp_t gfp_mask,
ib_sa_comp_mask comp_mask, int timeout_ms,
gfp_t gfp_mask,
void (*callback)(int status,
struct ib_sa_mcmember_rec *resp,
void *context),
void *context,
struct ib_sa_query **sa_query);
void *context, struct ib_sa_query **sa_query);

int mcast_init(void);
void mcast_cleanup(void);
Expand Down
3 changes: 1 addition & 2 deletions include/rdma/ib_addr.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ int rdma_resolve_ip(struct sockaddr *src_addr, const struct sockaddr *dst_addr,
struct rdma_dev_addr *addr, int timeout_ms,
void (*callback)(int status, struct sockaddr *src_addr,
struct rdma_dev_addr *addr, void *context),
bool resolve_by_gid_attr,
void *context);
bool resolve_by_gid_attr, void *context);

void rdma_addr_cancel(struct rdma_dev_addr *addr);

Expand Down
36 changes: 15 additions & 21 deletions include/rdma/ib_sa.h
Original file line number Diff line number Diff line change
Expand Up @@ -449,28 +449,23 @@ struct ib_sa_query;

void ib_sa_cancel_query(int id, struct ib_sa_query *query);

int ib_sa_path_rec_get(struct ib_sa_client *client,
struct ib_device *device, u8 port_num,
struct sa_path_rec *rec,
ib_sa_comp_mask comp_mask,
int timeout_ms, gfp_t gfp_mask,
void (*callback)(int status,
struct sa_path_rec *resp,
int ib_sa_path_rec_get(struct ib_sa_client *client, struct ib_device *device,
u8 port_num, struct sa_path_rec *rec,
ib_sa_comp_mask comp_mask, int timeout_ms,
gfp_t gfp_mask,
void (*callback)(int status, struct sa_path_rec *resp,
void *context),
void *context,
struct ib_sa_query **query);
void *context, struct ib_sa_query **query);

int ib_sa_service_rec_query(struct ib_sa_client *client,
struct ib_device *device, u8 port_num,
u8 method,
struct ib_sa_service_rec *rec,
ib_sa_comp_mask comp_mask,
int timeout_ms, gfp_t gfp_mask,
void (*callback)(int status,
struct ib_sa_service_rec *resp,
void *context),
void *context,
struct ib_sa_query **sa_query);
struct ib_device *device, u8 port_num, u8 method,
struct ib_sa_service_rec *rec,
ib_sa_comp_mask comp_mask, int timeout_ms,
gfp_t gfp_mask,
void (*callback)(int status,
struct ib_sa_service_rec *resp,
void *context),
void *context, struct ib_sa_query **sa_query);

struct ib_sa_multicast {
struct ib_sa_mcmember_rec rec;
Expand Down Expand Up @@ -577,8 +572,7 @@ int ib_sa_guid_info_rec_query(struct ib_sa_client *client,
void (*callback)(int status,
struct ib_sa_guidinfo_rec *resp,
void *context),
void *context,
struct ib_sa_query **sa_query);
void *context, struct ib_sa_query **sa_query);

bool ib_sa_sendonly_fullmem_support(struct ib_sa_client *client,
struct ib_device *device,
Expand Down

0 comments on commit 9549c2b

Please sign in to comment.