staging: unisys: refactor uisctrl_unregister_req_handler_ex()

Get rid of the unnecessary goto statement and just return directly.

Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/uislib/uisutils.c b/drivers/staging/unisys/uislib/uisutils.c
index 9ca10e923d89d5556595342d7fe5658f714b8998..e8c868ea220638e4c6cf2addf5ea067a4e04746b 100644 (file)
--- a/drivers/staging/unisys/uislib/uisutils.c
+++ b/drivers/staging/unisys/uislib/uisutils.c
@@ -155,20 +155,14 @@ EXPORT_SYMBOL_GPL(uisctrl_register_req_handler_ex);
 int
 uisctrl_unregister_req_handler_ex(uuid_le switch_uuid)
 {
-       int rc = 0;             /* assume failure */
-
        LOGINF("type=%pUL.\n", &switch_uuid);
        if (req_handler_del(switch_uuid) < 0) {
                LOGERR("failed to remove %pUL from server list\n",
                       &switch_uuid);
-               goto Away;
+               return 0;
        }
        atomic_dec(&uisutils_registered_services);
-       rc = 1;                 /* success */
-Away:
-       if (!rc)
-               LOGERR("failed to unregister type %pUL.\n", &switch_uuid);
-       return rc;
+       return 1;
 }
 EXPORT_SYMBOL_GPL(uisctrl_unregister_req_handler_ex);