staging: unisys: refactor uisctrl_register_req_handler_ex()

Fix CamelCase local variable name:

pReqHandlerInfo => req_handler

Get rid of the useless goto and just return straight away on an error.

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 6d13eb23d4971b198f05762f3f6c71b54dd9a539..9ca10e923d89d5556595342d7fe5658f714b8998 100644 (file)
--- a/drivers/staging/unisys/uislib/uisutils.c
+++ b/drivers/staging/unisys/uislib/uisutils.c
@@ -112,46 +112,43 @@ uisctrl_register_req_handler_ex(uuid_le switch_uuid,
                                                u32 client_str_len, u64 bytes),
                        struct ultra_vbus_deviceinfo *chipset_driver_info)
 {
-       struct req_handler_info *pReqHandlerInfo;
-       int rc = 0;             /* assume failure */
+       struct req_handler_info *req_handler;
 
        LOGINF("type=%pUL, controlfunc=0x%p.\n",
               &switch_uuid, controlfunc);
        if (!controlfunc) {
                LOGERR("%pUL: controlfunc must be supplied\n", &switch_uuid);
-               goto Away;
+               return 0;
        }
        if (!server_channel_ok) {
                LOGERR("%pUL: Server_Channel_Ok must be supplied\n",
                                &switch_uuid);
-               goto Away;
+               return 0;
        }
        if (!server_channel_init) {
                LOGERR("%pUL: Server_Channel_Init must be supplied\n",
                                &switch_uuid);
-               goto Away;
+               return 0;
        }
-       pReqHandlerInfo = req_handler_add(switch_uuid,
-                                       switch_type_name,
-                                       controlfunc,
-                                       min_channel_bytes,
-                                       server_channel_ok, server_channel_init);
-       if (!pReqHandlerInfo) {
+       req_handler = req_handler_add(switch_uuid,
+                                     switch_type_name,
+                                     controlfunc,
+                                     min_channel_bytes,
+                                     server_channel_ok, server_channel_init);
+       if (!req_handler) {
                LOGERR("failed to add %pUL to server list\n", &switch_uuid);
-               goto Away;
+               return 0;
        }
 
        atomic_inc(&uisutils_registered_services);
-       rc = 1;                 /* success */
-Away:
-       if (rc) {
-               if (chipset_driver_info)
-                       bus_device_info_init(chipset_driver_info, "chipset",
-                                            "uislib", VERSION, NULL);
-       } else {
-               LOGERR("failed to register type %pUL.\n", &switch_uuid);
+       if (chipset_driver_info) {
+               bus_device_info_init(chipset_driver_info, "chipset",
+                                    "uislib", VERSION, NULL);
+               return 1;
        }
-       return rc;
+
+       LOGERR("failed to register type %pUL.\n", &switch_uuid);
+       return 0;
 }
 EXPORT_SYMBOL_GPL(uisctrl_register_req_handler_ex);