net/af_iucv: remove wrappers around iucv (de-)registration

These wrappers are just unnecessary obfuscation.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 4bff26f7faff677121306681cf751c5fa7d9b3f9..18316ee3c69214b22aced0baacd484781c158b7a 100644 (file)
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -2264,16 +2264,6 @@ static struct packet_type iucv_packet_type = {
        .func = afiucv_hs_rcv,
 };
 
-static int afiucv_iucv_init(void)
-{
-       return pr_iucv->iucv_register(&af_iucv_handler, 0);
-}
-
-static void afiucv_iucv_exit(void)
-{
-       pr_iucv->iucv_unregister(&af_iucv_handler, 0);
-}
-
 static int __init afiucv_init(void)
 {
        int err;
@@ -2300,7 +2290,7 @@ static int __init afiucv_init(void)
                goto out_proto;
 
        if (pr_iucv) {
-               err = afiucv_iucv_init();
+               err = pr_iucv->iucv_register(&af_iucv_handler, 0);
                if (err)
                        goto out_sock;
        }
@@ -2314,7 +2304,7 @@ static int __init afiucv_init(void)
 
 out_notifier:
        if (pr_iucv)
-               afiucv_iucv_exit();
+               pr_iucv->iucv_unregister(&af_iucv_handler, 0);
 out_sock:
        sock_unregister(PF_IUCV);
 out_proto:
@@ -2326,7 +2316,7 @@ out:
 static void __exit afiucv_exit(void)
 {
        if (pr_iucv)
-               afiucv_iucv_exit();
+               pr_iucv->iucv_unregister(&af_iucv_handler, 0);
 
        unregister_netdevice_notifier(&afiucv_netdev_notifier);
        dev_remove_pack(&iucv_packet_type);