[tip:smp/hotplug] net/iucv: Use explicit clean up labels in iucv_init()

[tip-bot for Sebastian Andrzej Siewior]

Commit-ID:  9c6bafab03dec222237b6eb8b5adf5c18ec76264
Gitweb:     http://git.kernel.org/tip/9c6bafab03dec222237b6eb8b5adf5c18ec76264
Author:     Sebastian Andrzej Siewior <bige...@linutronix.de>
AuthorDate: Thu, 24 Nov 2016 17:10:13 +0100
Committer:  Thomas Gleixner <t...@linutronix.de>
CommitDate: Mon, 28 Nov 2016 17:29:04 +0100

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 38b482929e8f ("net/iucv: Convert to hotplug state machine").

Suggested-by: Ursula Braun <ubr...@linux.vnet.ibm.com>
Signed-off-by: Sebastian Andrzej Siewior <bige...@linutronix.de>
Cc: linux-s...@vger.kernel.org
Cc: net...@vger.kernel.org
Cc: r...@linutronix.de
Cc: "David S. Miller" <da...@davemloft.net>
Link: http://lkml.kernel.org/r/20161124161013.dukr42y2nwsco...@linutronix.de
Signed-off-by: Thomas Gleixner <t...@linutronix.de>
---
 net/iucv/iucv.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index f0d6afc..8f7ef16 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -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)
-               cpuhp_remove_state(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);