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, 13 insertions, 8 deletions

diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c
index f66737ba1299..0604fd78f826 100644
--- a/drivers/net/gtp.c
+++ b/drivers/net/gtp.c
@@ -1094,13 +1094,7 @@ static int gtp_genl_del_pdp(struct sk_buff *skb, struct genl_info *info)
         return 0;
 }
 
-static struct genl_family gtp_genl_family = {
-        .name           = "gtp",
-        .version        = 0,
-        .hdrsize        = 0,
-        .maxattr        = GTPA_MAX,
-        .netnsok        = true,
-};
+static struct genl_family gtp_genl_family;
 
 static int gtp_genl_fill_info(struct sk_buff *skb, u32 snd_portid, u32 snd_seq,
                               u32 type, struct pdp_ctx *pctx)
@@ -1296,6 +1290,17 @@ static const struct genl_ops gtp_genl_ops[] = {
         },
 };
 
+static struct genl_family gtp_genl_family = {
+        .name           = "gtp",
+        .version        = 0,
+        .hdrsize        = 0,
+        .maxattr        = GTPA_MAX,
+        .netnsok        = true,
+        .module         = THIS_MODULE,
+        .ops            = gtp_genl_ops,
+        .n_ops          = ARRAY_SIZE(gtp_genl_ops),
+};
+
 static int __net_init gtp_net_init(struct net *net)
 {
         struct gtp_net *gn = net_generic(net, gtp_net_id);
@@ -1335,7 +1340,7 @@ static int __init gtp_init(void)
         if (err < 0)
                 goto error_out;
 
-        err = genl_register_family_with_ops(&gtp_genl_family, gtp_genl_ops);
+        err = genl_register_family(&gtp_genl_family);
         if (err < 0)
                 goto unreg_rtnl_link;