Commit ff8424be authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller

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

These wrappers are just unnecessary obfuscation.
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4eb9eda6
...@@ -2264,16 +2264,6 @@ static struct packet_type iucv_packet_type = { ...@@ -2264,16 +2264,6 @@ static struct packet_type iucv_packet_type = {
.func = afiucv_hs_rcv, .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) static int __init afiucv_init(void)
{ {
int err; int err;
...@@ -2300,7 +2290,7 @@ static int __init afiucv_init(void) ...@@ -2300,7 +2290,7 @@ static int __init afiucv_init(void)
goto out_proto; goto out_proto;
if (pr_iucv) { if (pr_iucv) {
err = afiucv_iucv_init(); err = pr_iucv->iucv_register(&af_iucv_handler, 0);
if (err) if (err)
goto out_sock; goto out_sock;
} }
...@@ -2314,7 +2304,7 @@ static int __init afiucv_init(void) ...@@ -2314,7 +2304,7 @@ static int __init afiucv_init(void)
out_notifier: out_notifier:
if (pr_iucv) if (pr_iucv)
afiucv_iucv_exit(); pr_iucv->iucv_unregister(&af_iucv_handler, 0);
out_sock: out_sock:
sock_unregister(PF_IUCV); sock_unregister(PF_IUCV);
out_proto: out_proto:
...@@ -2326,7 +2316,7 @@ static int __init afiucv_init(void) ...@@ -2326,7 +2316,7 @@ static int __init afiucv_init(void)
static void __exit afiucv_exit(void) static void __exit afiucv_exit(void)
{ {
if (pr_iucv) if (pr_iucv)
afiucv_iucv_exit(); pr_iucv->iucv_unregister(&af_iucv_handler, 0);
unregister_netdevice_notifier(&afiucv_netdev_notifier); unregister_netdevice_notifier(&afiucv_netdev_notifier);
dev_remove_pack(&iucv_packet_type); dev_remove_pack(&iucv_packet_type);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment