Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c6bafab authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner
Browse files

net/iucv: Use explicit clean up labels in iucv_init() 



Ursula suggested to use explicit labels for clean up in the error path
instead of one `out_free' label, which handles multiple exits, introduced
in commit 38b48292 ("net/iucv: Convert to hotplug state machine").

Suggested-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: linux-s390@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: rt@linutronix.de
Cc: "David S. Miller" <davem@davemloft.net>
Link: http://lkml.kernel.org/r/20161124161013.dukr42y2nwscosk6@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c8b877a5

net/iucv/iucv.c

+7 −7
Original line number Diff line number Diff line
@@ -2038,16 +2038,16 @@ static int __init iucv_init(void) 
	rc = cpuhp_setup_state(CPUHP_NET_IUCV_PREPARE, "net/iucv:prepare",

			       iucv_cpu_prepare, iucv_cpu_dead);

	if (rc)

		goto out_free;

		goto out_dev;

	rc = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "net/iucv:online",

			       iucv_cpu_online, iucv_cpu_down_prep);

	if (rc < 0)

		goto out_free;

		goto out_prep;

	iucv_online = rc;



	rc = register_reboot_notifier(&iucv_reboot_notifier);

	if (rc)

		goto out_free;

		goto out_remove_hp;

	ASCEBC(iucv_error_no_listener, 16);

	ASCEBC(iucv_error_no_memory, 16);

	ASCEBC(iucv_error_pathid, 16);
@@ -2061,11 +2061,11 @@ static int __init iucv_init(void) 


out_reboot:

	unregister_reboot_notifier(&iucv_reboot_notifier);

out_free:

	if (iucv_online)

out_remove_hp:

	cpuhp_remove_state(iucv_online);

out_prep:

	cpuhp_remove_state(CPUHP_NET_IUCV_PREPARE);



out_dev:

	root_device_unregister(iucv_root);

out_int:

	unregister_external_irq(EXT_IRQ_IUCV, iucv_external_interrupt);