genetlink: statically initialize families

Instead of providing macros/inline functions to initialize
the families, make all users initialize them statically and
get rid of the macros.

This reduces the kernel code size by about 1.6k on x86-64
(with allyesconfig).

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 5 deletions

diff --git a/fs/dlm/netlink.c b/fs/dlm/netlink.c
index 00d226956264..04042d69573c 100644
--- a/fs/dlm/netlink.c
+++ b/fs/dlm/netlink.c
@@ -16,10 +16,7 @@
 static uint32_t dlm_nl_seqnum;
 static uint32_t listener_nlportid;
 
-static struct genl_family family = {
-        .name           = DLM_GENL_NAME,
-        .version        = DLM_GENL_VERSION,
-};
+static struct genl_family family;
 
 static int prepare_data(u8 cmd, struct sk_buff **skbp, size_t size)
 {
@@ -75,9 +72,17 @@ static struct genl_ops dlm_nl_ops[] = {
         },
 };
 
+static struct genl_family family = {
+        .name           = DLM_GENL_NAME,
+        .version        = DLM_GENL_VERSION,
+        .ops            = dlm_nl_ops,
+        .n_ops          = ARRAY_SIZE(dlm_nl_ops),
+        .module         = THIS_MODULE,
+};
+
 int __init dlm_netlink_init(void)
 {
-        return genl_register_family_with_ops(&family, dlm_nl_ops);
+        return genl_register_family(&family);
 }
 
 void dlm_netlink_exit(void)