20 files changed, 31 insertions, 37 deletions

diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
index ba2c611154af..165914e63ef2 100644
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@ -500,8 +500,7 @@ static int __init crypto_user_init(void)
                 .input  = crypto_netlink_rcv,
         };
 
-        crypto_nlsk = netlink_kernel_create(&init_net, NETLINK_CRYPTO,
-                                            THIS_MODULE, &cfg);
+        crypto_nlsk = netlink_kernel_create(&init_net, NETLINK_CRYPTO, &cfg);
         if (!crypto_nlsk)
                 return -ENOMEM;
 
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 82fa4f0f91d6..965b7811e04f 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -264,8 +264,7 @@ static int __devinit cn_init(void)
                 .input  = dev->input,
         };
 
-        dev->nls = netlink_kernel_create(&init_net, NETLINK_CONNECTOR,
-                                         THIS_MODULE, &cfg);
+        dev->nls = netlink_kernel_create(&init_net, NETLINK_CONNECTOR, &cfg);
         if (!dev->nls)
                 return -EIO;
 
diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
index 3ae2bfd31015..fe10a949aef9 100644
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -177,7 +177,7 @@ int __init ibnl_init(void)
                 .input  = ibnl_rcv,
         };
 
-        nls = netlink_kernel_create(&init_net, NETLINK_RDMA, THIS_MODULE, &cfg);
+        nls = netlink_kernel_create(&init_net, NETLINK_RDMA, &cfg);
         if (!nls) {
                 pr_warn("Failed to create netlink socket\n");
                 return -ENOMEM;
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index 8818dd681c19..3252bc9625ee 100644
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -501,7 +501,7 @@ scsi_netlink_init(void)
         }
 
         scsi_nl_sock = netlink_kernel_create(&init_net, NETLINK_SCSITRANSPORT,
-                                             THIS_MODULE, &cfg);
+                                             &cfg);
         if (!scsi_nl_sock) {
                 printk(KERN_ERR "%s: register of receive handler failed\n",
                                 __func__);
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index fa1dfaa83e32..519bd5303f3f 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -2969,8 +2969,7 @@ static __init int iscsi_transport_init(void)
         if (err)
                 goto unregister_conn_class;
 
-        nls = netlink_kernel_create(&init_net, NETLINK_ISCSI,
-                                    THIS_MODULE, &cfg);
+        nls = netlink_kernel_create(&init_net, NETLINK_ISCSI, &cfg);
         if (!nls) {
                 err = -ENOBUFS;
                 goto unregister_session_class;
diff --git a/drivers/staging/gdm72xx/netlink_k.c b/drivers/staging/gdm72xx/netlink_k.c
index 3abb31df8f28..2109cab0a14c 100644
--- a/drivers/staging/gdm72xx/netlink_k.c
+++ b/drivers/staging/gdm72xx/netlink_k.c
@@ -95,7 +95,7 @@ struct sock *netlink_init(int unit, void (*cb)(struct net_device *dev, u16 type,
         init_MUTEX(&netlink_mutex);
 #endif
 
-        sock = netlink_kernel_create(&init_net, unit, THIS_MODULE, &cfg);
+        sock = netlink_kernel_create(&init_net, unit, &cfg);
 
         if (sock)
                 rcv_cb = cb;
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 8719a4e235a5..cd17dda5a987 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -153,6 +153,7 @@ struct nlattr {
 
 #include <linux/capability.h>
 #include <linux/skbuff.h>
+#include <linux/module.h>
 #include <net/scm.h>
 
 struct net;
@@ -188,9 +189,15 @@ struct netlink_kernel_cfg {
         unsigned int    flags;
 };
 
-extern struct sock *netlink_kernel_create(struct net *net, int unit,
-                                          struct module *module,
-                                          struct netlink_kernel_cfg *cfg);
+extern struct sock *__netlink_kernel_create(struct net *net, int unit,
+                                            struct module *module,
+                                            struct netlink_kernel_cfg *cfg);
+static inline struct sock *
+netlink_kernel_create(struct net *net, int unit, struct netlink_kernel_cfg *cfg)
+{
+        return __netlink_kernel_create(net, unit, THIS_MODULE, cfg);
+}
+
 extern void netlink_kernel_release(struct sock *sk);
 extern int __netlink_change_ngroups(struct sock *sk, unsigned int groups);
 extern int netlink_change_ngroups(struct sock *sk, unsigned int groups);
diff --git a/kernel/audit.c b/kernel/audit.c
index ea3b7b6191c7..a24aafa850ae 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -971,8 +971,7 @@ static int __init audit_init(void)
 
         printk(KERN_INFO "audit: initializing netlink socket (%s)\n",
                audit_default ? "enabled" : "disabled");
-        audit_sock = netlink_kernel_create(&init_net, NETLINK_AUDIT,
-                                           THIS_MODULE, &cfg);
+        audit_sock = netlink_kernel_create(&init_net, NETLINK_AUDIT, &cfg);
         if (!audit_sock)
                 audit_panic("cannot initialize netlink socket");
         else
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index c2e97787d01e..52e5abbc41db 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -382,8 +382,7 @@ static int uevent_net_init(struct net *net)
         if (!ue_sk)
                 return -ENOMEM;
 
-        ue_sk->sk = netlink_kernel_create(net, NETLINK_KOBJECT_UEVENT,
-                                          THIS_MODULE, &cfg);
+        ue_sk->sk = netlink_kernel_create(net, NETLINK_KOBJECT_UEVENT, &cfg);
         if (!ue_sk->sk) {
                 printk(KERN_ERR
                        "kobject_uevent: unable to create netlink socket!\n");
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index 19063473c71f..3476ec469740 100644
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -298,8 +298,7 @@ static int __init ebt_ulog_init(void)
                 spin_lock_init(&ulog_buffers[i].lock);
         }
 
-        ebtulognl = netlink_kernel_create(&init_net, NETLINK_NFLOG,
-                                          THIS_MODULE, &cfg);
+        ebtulognl = netlink_kernel_create(&init_net, NETLINK_NFLOG, &cfg);
         if (!ebtulognl)
                 ret = -ENOMEM;
         else if ((ret = xt_register_target(&ebt_ulog_tg_reg)) != 0)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index a71806eb9cc6..508c5df4a09c 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2384,7 +2384,7 @@ static int __net_init rtnetlink_net_init(struct net *net)
                 .flags          = NL_CFG_F_NONROOT_RECV,
         };
 
-        sk = netlink_kernel_create(net, NETLINK_ROUTE, THIS_MODULE, &cfg);
+        sk = netlink_kernel_create(net, NETLINK_ROUTE, &cfg);