Revert "mpls: Handle error of rtnl_register_module()."

This reverts commit 4597c38 which is
commit 5be2062 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I53b9129740fcf7a9a89ac36fc74510dfff93728e
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Author: gregkh

net/mpls/af_mpls.c

@@ -2729,15 +2729,6 @@ static struct rtnl_af_ops mpls_af_ops __read_mostly = {
 	.get_stats_af_size = mpls_get_stats_af_size,
 };
 
-static const struct rtnl_msg_handler mpls_rtnl_msg_handlers[] __initdata_or_module = {
-	{THIS_MODULE, PF_MPLS, RTM_NEWROUTE, mpls_rtm_newroute, NULL, 0},
-	{THIS_MODULE, PF_MPLS, RTM_DELROUTE, mpls_rtm_delroute, NULL, 0},
-	{THIS_MODULE, PF_MPLS, RTM_GETROUTE, mpls_getroute, mpls_dump_routes, 0},
-	{THIS_MODULE, PF_MPLS, RTM_GETNETCONF,
-	 mpls_netconf_get_devconf, mpls_netconf_dump_devconf,
-	 RTNL_FLAG_DUMP_UNLOCKED},
-};
-
 static int __init mpls_init(void)
 {
 	int err;
@@ -2756,25 +2747,24 @@ static int __init mpls_init(void)
 
 	rtnl_af_register(&mpls_af_ops);
 
-	err = rtnl_register_many(mpls_rtnl_msg_handlers);
-	if (err)
-		goto out_unregister_rtnl_af;
-
+	rtnl_register_module(THIS_MODULE, PF_MPLS, RTM_NEWROUTE,
+			     mpls_rtm_newroute, NULL, 0);
+	rtnl_register_module(THIS_MODULE, PF_MPLS, RTM_DELROUTE,
+			     mpls_rtm_delroute, NULL, 0);
+	rtnl_register_module(THIS_MODULE, PF_MPLS, RTM_GETROUTE,
+			     mpls_getroute, mpls_dump_routes, 0);
+	rtnl_register_module(THIS_MODULE, PF_MPLS, RTM_GETNETCONF,
+			     mpls_netconf_get_devconf,
+			     mpls_netconf_dump_devconf,
+			     RTNL_FLAG_DUMP_UNLOCKED);
 	err = ipgre_tunnel_encap_add_mpls_ops();
-	if (err) {
+	if (err)
 		pr_err("Can't add mpls over gre tunnel ops\n");
-		goto out_unregister_rtnl;
-	}
 
 	err = 0;
 out:
 	return err;
 
-out_unregister_rtnl:
-	rtnl_unregister_many(mpls_rtnl_msg_handlers);
-out_unregister_rtnl_af:
-	rtnl_af_unregister(&mpls_af_ops);
-	dev_remove_pack(&mpls_packet_type);
 out_unregister_pernet:
 	unregister_pernet_subsys(&mpls_net_ops);
 	goto out;