RDMA/netlink: Simplify code of autoload modules

The request_module() call is internally wrapped by CONFIG_MODULE,
so there is no need to check it in our RDMA code too.

Refactor to simplify the code.

Reviewed-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
index 0c7db94cd9b9eab2f5febec02f579fb7d897ae99..3ccaae18ad751086892dc424512c6d9122678eeb 100644 (file)
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -81,15 +81,13 @@ static bool is_nl_valid(unsigned int type, unsigned int op)
        if (!is_nl_msg_valid(type, op))
                return false;
 
-       cb_table = rdma_nl_types[type].cb_table;
-#ifdef CONFIG_MODULES
-       if (!cb_table) {
+       if (!rdma_nl_types[type].cb_table) {
                mutex_unlock(&rdma_nl_mutex);
                request_module("rdma-netlink-subsys-%d", type);
                mutex_lock(&rdma_nl_mutex);
-               cb_table = rdma_nl_types[type].cb_table;
        }
-#endif
+
+       cb_table = rdma_nl_types[type].cb_table;
 
        if (!cb_table || (!cb_table[op].dump && !cb_table[op].doit))
                return false;