Skip to content

Commit ff8424b

Browse files
julianwiedmanndavem330
authored andcommitted
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>
1 parent 4eb9eda commit ff8424b

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

net/iucv/af_iucv.c

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2264,16 +2264,6 @@ static struct packet_type iucv_packet_type = {
22642264
.func = afiucv_hs_rcv,
22652265
};
22662266

2267-
static int afiucv_iucv_init(void)
2268-
{
2269-
return pr_iucv->iucv_register(&af_iucv_handler, 0);
2270-
}
2271-
2272-
static void afiucv_iucv_exit(void)
2273-
{
2274-
pr_iucv->iucv_unregister(&af_iucv_handler, 0);
2275-
}
2276-
22772267
static int __init afiucv_init(void)
22782268
{
22792269
int err;
@@ -2300,7 +2290,7 @@ static int __init afiucv_init(void)
23002290
goto out_proto;
23012291

23022292
if (pr_iucv) {
2303-
err = afiucv_iucv_init();
2293+
err = pr_iucv->iucv_register(&af_iucv_handler, 0);
23042294
if (err)
23052295
goto out_sock;
23062296
}
@@ -2314,7 +2304,7 @@ static int __init afiucv_init(void)
23142304

23152305
out_notifier:
23162306
if (pr_iucv)
2317-
afiucv_iucv_exit();
2307+
pr_iucv->iucv_unregister(&af_iucv_handler, 0);
23182308
out_sock:
23192309
sock_unregister(PF_IUCV);
23202310
out_proto:
@@ -2326,7 +2316,7 @@ static int __init afiucv_init(void)
23262316
static void __exit afiucv_exit(void)
23272317
{
23282318
if (pr_iucv)
2329-
afiucv_iucv_exit();
2319+
pr_iucv->iucv_unregister(&af_iucv_handler, 0);
23302320

23312321
unregister_netdevice_notifier(&afiucv_netdev_notifier);
23322322
dev_remove_pack(&iucv_packet_type);

0 commit comments

Comments
 (0)