diff options
| author | Ken Cox <jkc@redhat.com> | 2014-03-19 13:06:23 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-19 13:56:31 -0700 |
| commit | 097f4c19e838b5e8a5674b1ab9def7e20bc88e7a (patch) | |
| tree | 2b8a84c5b4d9279a7b34fce9321597eae268ed2e | |
| parent | d9355f8934a4c54d81a29ae7bd5ae4329c02aa48 (diff) | |
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>
| -rw-r--r-- | drivers/staging/unisys/include/timskmod.h | 2 | ||||
| -rw-r--r-- | drivers/staging/unisys/uislib/uisqueue.c | 1 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorchipset/parser.c | 4 | ||||
| -rw-r--r-- | drivers/staging/unisys/visorchipset/visorchipset_main.c | 12 |
4 files changed, 6 insertions, 13 deletions
diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h index 41cbcde7c15c..1101ecd85fc6 100644 --- 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 7bd05f7fe5ef..91b03ed829ef 100644 --- 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 6904dcce312b..b408d415bd8c 100644 --- 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 b769257d3aa8..b2355d930488 100644 --- 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); |