Staging: unisys: Remove RETVOID macro

The RETVOID macro contained a goto statement which is not allowed in
the kernel.

Signed-off-by: Ken Cox <jkc@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h
index 41cbcde7c15ca3660dbd53776f9a3e3e8d4a6707..1101ecd85fc61b29914e6278f79f407682023ee0 100644 (file)
--- a/drivers/staging/unisys/include/timskmod.h
+++ b/drivers/staging/unisys/include/timskmod.h
@@ -122,8 +122,6 @@ typedef long VMMIO32;/**< #VMMIO pointing to 32-bit data */
 #define RETTRACE(x)
 #endif
 
-/** return from a void function, using a common exit point "Away" */
-#define RETVOID    do { RETTRACE(0); goto Away; } while (0)
 /** return from an int function, using a common exit point "Away"
  *  @param x the value to return
  */

diff --git a/drivers/staging/unisys/uislib/uisqueue.c b/drivers/staging/unisys/uislib/uisqueue.c
index 7bd05f7fe5ef3b76ce2e7fd8bddf641c2020083d..91b03ed829ef9fd52c8cd4d4ac954a504327ea6e 100644 (file)
--- a/drivers/staging/unisys/uislib/uisqueue.c
+++ b/drivers/staging/unisys/uislib/uisqueue.c
@@ -28,7 +28,6 @@
 #define CURRENT_FILE_PC UISLIB_PC_uisqueue_c
 #define __MYFILE__ "uisqueue.c"
 
-#define RETVOID    do { goto Away; } while (0)
 #define RETINT(x)  do { rc = (x); goto Away; } while (0)
 
 #define CHECK_CACHE_ALIGN 0

diff --git a/drivers/staging/unisys/visorchipset/parser.c b/drivers/staging/unisys/visorchipset/parser.c
index 6904dcce312b94a617014d52953c1dbf00c7338a..b408d415bd8c763e8b19a576f5d672517cc6b19b 100644 (file)
--- a/drivers/staging/unisys/visorchipset/parser.c
+++ b/drivers/staging/unisys/visorchipset/parser.c
@@ -213,7 +213,7 @@ parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string)
        if (ctx == NULL) {
                ERRDRV("%s (%s:%d) - no context",
                       __func__, __FILE__, __LINE__);
-               RETVOID;
+               goto Away;
        }
        phdr = (ULTRA_CONTROLVM_PARAMETERS_HEADER *) (ctx->data);
        switch (which_string) {
@@ -235,10 +235,8 @@ parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string)
                break;
        default:
                ERRDRV("%s - bad which_string %d", __func__, which_string);
-               RETVOID;
                break;
        }
-       RETVOID;
 
 Away:
        return;

diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index b769257d3aa84f856709f23f8340c75a79d26cee..b2355d9304885a06cafa0d58e1b463341d0b6ce8 100644 (file)
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -1927,12 +1927,12 @@ controlvm_periodic_work(struct work_struct *work)
 
        /* make sure visorbus server is registered for controlvm callbacks */
        if (visorchipset_serverregwait && !serverregistered)
-               RETVOID;
+               goto Away;
        /* make sure visorclientbus server is regsitered for controlvm
         * callbacks
         */
        if (visorchipset_clientregwait && !clientregistered)
-               RETVOID;
+               goto Away;
 
        memset(&chanInfo, 0, sizeof(VISORCHIPSET_CHANNEL_INFO));
        if (!ControlVm_channel) {
@@ -1963,7 +1963,7 @@ controlvm_periodic_work(struct work_struct *work)
        if ((ControlVm_channel != NULL) || (Poll_Count >= 250))
                ;       /* keep going */
        else
-               RETVOID;
+               goto Away;
 
        /* Check events to determine if response to CHIPSET_READY
         * should be sent
@@ -2033,8 +2033,6 @@ controlvm_periodic_work(struct work_struct *work)
        /* parahotplug_worker */
        parahotplug_process_list();
 
-       RETVOID;
-
 Away:
 
        if (time_after(jiffies,
@@ -2071,13 +2069,13 @@ setup_crash_devices_work_queue(struct work_struct *work)
 
        /* make sure visorbus server is registered for controlvm callbacks */
        if (visorchipset_serverregwait && !serverregistered)
-               RETVOID;
+               goto Away;
 
        /* make sure visorclientbus server is regsitered for controlvm
         * callbacks
         */
        if (visorchipset_clientregwait && !clientregistered)
-               RETVOID;
+               goto Away;
 
        POSTCODE_LINUX_2(CRASH_DEV_ENTRY_PC, POSTCODE_SEVERITY_INFO);