Skip to content

Commit

Permalink
net/af_iucv: remove wrappers around iucv (de-)registration
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Julian Wiedmann authored and David S. Miller committed Aug 9, 2021
1 parent 4eb9eda commit ff8424b
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions net/iucv/af_iucv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
Expand All @@ -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:
Expand All @@ -2326,7 +2316,7 @@ static int __init afiucv_init(void)
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);
Expand Down

0 comments on commit ff8424b

Please sign in to comment.