[rdma-next v2 03/33] RDMA/netlink: Remove redundant owner option for netlink callbacks

Leon Romanovsky
2017-08-10T11:07:57Z

Owner field is not needed to be set because netlink is part of ib_core
which will be unloaded last after all other modules are unloaded.

Signed-off-by: Leon Romanovsky <leonro-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
drivers/infiniband/core/cma.c | 3 +--
drivers/infiniband/core/netlink.c | 2 --
include/rdma/rdma_netlink.h | 1 -
3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 2a16a559bdda..0c85f140e616 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -4459,8 +4459,7 @@ static int cma_get_id_stats(struct sk_buff *skb, struct netlink_callback *cb)
}

static const struct ibnl_client_cbs cma_cb_table[] = {
- [RDMA_NL_RDMA_CM_ID_STATS] = { .dump = cma_get_id_stats,
- .module = THIS_MODULE },
+ [RDMA_NL_RDMA_CM_ID_STATS] = { .dump = cma_get_id_stats},
};

static int cma_init_net(struct net *net)
diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
index 06f7ba31fbdd..cd9b7e7b7d2c 100644
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -180,12 +180,10 @@ static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
cb.skb = skb;
cb.nlh = nlh;
cb.dump = rdma_nl_types[index].cb_table[op].dump;
- cb.module = rdma_nl_types[index].cb_table[op].module;
return cb.dump(skb, &cb);
}

c.dump = rdma_nl_types[index].cb_table[op].dump;
- c.module = rdma_nl_types[index].cb_table[op].module;
return netlink_dump_start(nls, skb, nlh, &c);
}

diff --git a/include/rdma/rdma_netlink.h b/include/rdma/rdma_netlink.h
index aadf0ab963b2..c124d8e43fc8 100644
--- a/include/rdma/rdma_netlink.h
+++ b/include/rdma/rdma_netlink.h
@@ -7,7 +7,6 @@

struct ibnl_client_cbs {
int (*dump)(struct sk_buff *skb, struct netlink_callback *nlcb);
- struct module *module;
};

/**